X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingExamplesTest.py;h=86ee5d7671f94976aea21a7284c91d03f5b5f7f0;hb=46b819946914fdf15215ad330f101d1bba5edc5b;hp=b0e7647f7084597fbd9c1bebe4c8968468f552b3;hpb=ec0d2fa019c87f670675131f7ae89228664dc8d4;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py index b0e7647f7..86ee5d767 100644 --- a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py +++ b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# Copyright (C) 2007-2015 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 @@ -28,8 +28,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingFieldDouble_WriteVTK_1] # mesh coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) # mesh becomes a 2D one # 3 fields (lying on the same mesh!) @@ -43,7 +43,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): fileName = "testExample_MEDCouplingFieldDouble_WriteVTK" fs = [ field1, field2, field3 ] # field series writtenFileName=MEDCouplingFieldDouble.WriteVTK( fileName, fs ) - print "The file name with correct extension is : %s"%(writtenFileName) + print "The file name with correct extension is : %s"%(writtenFileName) #! [PySnippet_MEDCouplingFieldDouble_WriteVTK_1] import os os.remove( writtenFileName ) @@ -58,13 +58,13 @@ class MEDCouplingBasicsTest(unittest.TestCase): valsMin = [0.,0., 4.,4.] # expected min field # field 1 - valsArr1=DataArrayDouble.New(vals1,2,2) # 2 tuples per 2 components - field1 = MEDCouplingFieldDouble.New( ON_NODES ) + valsArr1=DataArrayDouble(vals1,2,2) # 2 tuples per 2 components + field1 = MEDCouplingFieldDouble( ON_NODES ) field1.setArray( valsArr1 ) # field 2 - valsArr2=DataArrayDouble.New(vals2,2,2) # 2 tuples per 2 components - field2 = MEDCouplingFieldDouble.New( ON_NODES ) + valsArr2=DataArrayDouble(vals2,2,2) # 2 tuples per 2 components + field2 = MEDCouplingFieldDouble( ON_NODES ) field2.setArray( valsArr2 ) # max field @@ -80,8 +80,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingFieldDouble_MergeFields_1] # mesh 1 coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh1=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh1=MEDCouplingCMesh() mesh1.setCoords(coordsArr) # field 1 field1 = mesh1.fillFromAnalytic( ON_CELLS, 1, "x") @@ -103,15 +103,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): coords1=[0.,1.,2.,3.] coords2=[2.,1.,0.,3.] #0 <==> #2 # mesh 1 - mesh1=MEDCouplingUMesh.New(); - coordsArr=DataArrayDouble.New(coords1, 4, 1); - mesh1.setCoords(coordsArr); - mesh1.setMeshDimension(0); - mesh1.allocateCells(0); - mesh1.finishInsertingCells(); + mesh1=MEDCouplingUMesh() + coordsArr=DataArrayDouble(coords1, 4, 1) + mesh1.setCoords(coordsArr) + mesh1.setMeshDimension(0) + mesh1.allocateCells(0) + mesh1.finishInsertingCells() # mesh 2 - mesh2=mesh1.deepCpy(); - mesh2.getCoords().setValues(coords2, 4, 1); + mesh2=mesh1.deepCpy() + mesh2.getCoords().setValues(coords2, 4, 1) #! [PySnippet_MEDCouplingFieldDouble_substractInPlaceDM_1] #! [PySnippet_MEDCouplingFieldDouble_substractInPlaceDM_2] field1 = mesh1.fillFromAnalytic(ON_NODES,1,"x") # field1 values == coords1 @@ -130,15 +130,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): coords1=[0.,1.,2.,3.] coords2=[2.,1.,0.,3.] #0 <==> #2 # mesh 1 - mesh1=MEDCouplingUMesh.New(); - coordsArr=DataArrayDouble.New(coords1, 4, 1); - mesh1.setCoords(coordsArr); - mesh1.setMeshDimension(0); - mesh1.allocateCells(0); - mesh1.finishInsertingCells(); + mesh1=MEDCouplingUMesh() + coordsArr=DataArrayDouble(coords1, 4, 1) + mesh1.setCoords(coordsArr) + mesh1.setMeshDimension(0) + mesh1.allocateCells(0) + mesh1.finishInsertingCells() # mesh 2 - mesh2=mesh1.deepCpy(); - mesh2.getCoords().setValues(coords2, 4, 1); + mesh2=mesh1.deepCpy() + mesh2.getCoords().setValues(coords2, 4, 1) #! [PySnippet_MEDCouplingFieldDouble_changeUnderlyingMesh_1] #! [PySnippet_MEDCouplingFieldDouble_changeUnderlyingMesh_2] field = mesh1.fillFromAnalytic(ON_NODES,1,"x") # field values == coords1 @@ -151,11 +151,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_applyFunc_same_nb_comp(self): #! [PySnippet_MEDCouplingFieldDouble_applyFunc_same_nb_comp_1] v = [1.,2., 3.,4.] - array = DataArrayDouble.New( v, 2, 2 ) # 2 tuples per 2 components - field = MEDCouplingFieldDouble.New( ON_CELLS ) + array = DataArrayDouble( v, 2, 2 ) # 2 tuples per 2 components + field = MEDCouplingFieldDouble( ON_CELLS ) field.setArray( array ) - func = "IVec * v + JVec * v*v + 10" - field.applyFunc( func ) + func = "IVec * v + JVec * w*w + 10" + field.applyFunc( 2, func ) self.assertTrue( field.getNumberOfComponents() == 2 ) # 2 components remains #! [PySnippet_MEDCouplingFieldDouble_applyFunc_same_nb_comp_1] #! [PySnippet_MEDCouplingFieldDouble_applyFunc_same_nb_comp_2] @@ -171,8 +171,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingFieldDouble_applyFunc3_1] # create a 2D vector field values = [1.,1., 2.,1.] - array = DataArrayDouble.New( values, 2, 2 ) # 2 tuples per 2 components - field = MEDCouplingFieldDouble.New( ON_CELLS ) + array = DataArrayDouble( values, 2, 2 ) # 2 tuples per 2 components + field = MEDCouplingFieldDouble( ON_CELLS ) field.setArray( array ) # transform the field to a 3D vector field func = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10" @@ -193,10 +193,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingFieldDouble_applyFunc2_1] # create a 2D vector field values = [1.,1., 2.,1.] - array = DataArrayDouble.New( values, 2, 2 ) # 2 tuples per 2 components + array = DataArrayDouble( values, 2, 2 ) # 2 tuples per 2 components array.setInfoOnComponent(0,"a") # name used to refer to X component within a function array.setInfoOnComponent(1,"b") # name used to refer to Y component within a function - field = MEDCouplingFieldDouble.New( ON_CELLS ) + field = MEDCouplingFieldDouble( ON_CELLS ) field.setArray( array ) # transform the field to a 3D vector field func = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10" @@ -216,8 +216,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingFieldDouble_applyFunc_1] # create a 2D vector field values = [1.,1., 2.,1.] - array = DataArrayDouble.New( values, 2, 2 ) # 2 tuples per 2 components - field = MEDCouplingFieldDouble.New( ON_CELLS ) + array = DataArrayDouble( values, 2, 2 ) # 2 tuples per 2 components + field = MEDCouplingFieldDouble( ON_CELLS ) field.setArray( array ) # transform the field to a 3D vector field func = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10" @@ -236,10 +236,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_applyFunc_val(self): #! [PySnippet_MEDCouplingFieldDouble_applyFunc_val_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) - field = MEDCouplingFieldDouble.New( ON_CELLS ) + field = MEDCouplingFieldDouble( ON_CELLS ) field.setMesh( mesh ) field.fillFromAnalytic(2,"IVec * x + JVec * y") # 2 components #! [PySnippet_MEDCouplingFieldDouble_applyFunc_val_1] @@ -255,13 +255,13 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_fillFromAnalytic3(self): #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic3_1] coords = [0.,2.,4.,6.] # 6. is not used - x=DataArrayDouble.New(coords[:3],3,1) - y=DataArrayDouble.New(coords[:2],2,1) - mesh=MEDCouplingCMesh.New() + x=DataArrayDouble(coords[:3],3,1) + y=DataArrayDouble(coords[:2],2,1) + mesh=MEDCouplingCMesh() mesh.setCoords(x,y) #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic3_1] #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic3_2] - field = MEDCouplingFieldDouble.New( ON_CELLS ) + field = MEDCouplingFieldDouble( ON_CELLS ) field.setMesh( mesh ) func = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10" varNames=["a","b"] # names used to refer to X and Y coord components @@ -284,15 +284,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_fillFromAnalytic2(self): #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic2_1] coords = [0.,2.,4.] - x=DataArrayDouble.New(coords[:3],3,1) - y=DataArrayDouble.New(coords[:2],2,1) + x=DataArrayDouble(coords[:3],3,1) + y=DataArrayDouble(coords[:2],2,1) x.setInfoOnComponent(0,"a") # name used to refer to X coordinate within a function y.setInfoOnComponent(0,"b") # name used to refer to Y coordinate within a function - mesh=MEDCouplingCMesh.New() + mesh=MEDCouplingCMesh() mesh.setCoords(x,y) #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic2_1] #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic2_2] - field = MEDCouplingFieldDouble.New( ON_CELLS ) + field = MEDCouplingFieldDouble( ON_CELLS ) field.setMesh( mesh ) func = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10" field.fillFromAnalytic2(3,func) @@ -314,13 +314,13 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_fillFromAnalytic(self): #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic_1] coords = [0.,2.,4.] - x=DataArrayDouble.New(coords[:3],3,1) - y=DataArrayDouble.New(coords[:2],2,1) - mesh=MEDCouplingCMesh.New() + x=DataArrayDouble(coords[:3],3,1) + y=DataArrayDouble(coords[:2],2,1) + mesh=MEDCouplingCMesh() mesh.setCoords(x,y) #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic_1] #! [PySnippet_MEDCouplingFieldDouble_fillFromAnalytic_2] - field = MEDCouplingFieldDouble.New( ON_CELLS ) + field = MEDCouplingFieldDouble( ON_CELLS ) field.setMesh( mesh ) func = "IVec * b + JVec * a + KVec * sqrt( a*a + b*b ) + 10" field.fillFromAnalytic(3,func) @@ -342,12 +342,12 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_getValueOn_time(self): #! [PySnippet_MEDCouplingFieldDouble_getValueOn_time_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) #! [PySnippet_MEDCouplingFieldDouble_getValueOn_time_1] #! [PySnippet_MEDCouplingFieldDouble_getValueOn_time_2] - field = MEDCouplingFieldDouble.New( ON_CELLS, LINEAR_TIME ) + field = MEDCouplingFieldDouble( ON_CELLS, LINEAR_TIME ) field.setMesh( mesh ) field.fillFromAnalytic(1,"10") # all values == 10. field.setEndArray( field.getArray() + field.getArray() ) # all values == 20. @@ -365,8 +365,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_getValueOnMulti(self): #! [PySnippet_MEDCouplingFieldDouble_getValueOnMulti_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) field = mesh.fillFromAnalytic(ON_CELLS,1,"x+y") #! [PySnippet_MEDCouplingFieldDouble_getValueOnMulti_1] @@ -380,8 +380,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_getValueOn(self): #! [PySnippet_MEDCouplingFieldDouble_getValueOn_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) field = mesh.fillFromAnalytic(ON_CELLS,1,"x+y") #! [PySnippet_MEDCouplingFieldDouble_getValueOn_1] @@ -397,8 +397,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_getValueOnPos(self): #! [PySnippet_MEDCouplingFieldDouble_getValueOnPos_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) field = mesh.fillFromAnalytic(ON_CELLS,1,"x+y") #! [PySnippet_MEDCouplingFieldDouble_getValueOnPos_1] @@ -412,8 +412,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_renumberNodes(self): #! [PySnippet_MEDCouplingFieldDouble_renumberNodes_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) mesh=mesh.buildUnstructured() #! [PySnippet_MEDCouplingFieldDouble_renumberNodes_1] @@ -437,8 +437,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_renumberCells(self): #! [PySnippet_MEDCouplingFieldDouble_renumberCells_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) mesh=mesh.buildUnstructured() #! [PySnippet_MEDCouplingFieldDouble_renumberCells_1] @@ -461,8 +461,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingFieldDouble_buildNewTimeReprFromThis(self): #! [PySnippet_MEDCouplingFieldDouble_buildNewTimeReprFromThis_1] coords = [0.,2.,4.] - coordsArr=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + coordsArr=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoords(coordsArr,coordsArr) field1 = mesh.fillFromAnalytic(ON_NODES,1,"x+y") self.assertTrue( field1.getTimeDiscretization() == ONE_TIME ) @@ -476,9 +476,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingMesh_fillFromAnalytic3(self): #! [PySnippet_MEDCouplingMesh_fillFromAnalytic3_1] coords = [0.,2.,4.,6.] # 6. is not used - x=DataArrayDouble.New(coords[:3],3,1) - y=DataArrayDouble.New(coords[:2],2,1) - mesh=MEDCouplingCMesh.New() + x=DataArrayDouble(coords[:3],3,1) + y=DataArrayDouble(coords[:2],2,1) + mesh=MEDCouplingCMesh() mesh.setCoords(x,y) #! [PySnippet_MEDCouplingMesh_fillFromAnalytic3_1] #! [PySnippet_MEDCouplingMesh_fillFromAnalytic3_2] @@ -503,11 +503,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingMesh_fillFromAnalytic2(self): #! [PySnippet_MEDCouplingMesh_fillFromAnalytic2_1] coords = [0.,2.,4.,6.] # 6. is not used - x=DataArrayDouble.New(coords[:3],3,1) - y=DataArrayDouble.New(coords[:2],2,1) + x=DataArrayDouble(coords[:3],3,1) + y=DataArrayDouble(coords[:2],2,1) x.setInfoOnComponent(0,"a") # name used to refer to X coordinate within a function y.setInfoOnComponent(0,"b") # name used to refer to Y coordinate within a function - mesh=MEDCouplingCMesh.New() + mesh=MEDCouplingCMesh() mesh.setCoords(x,y) #! [PySnippet_MEDCouplingMesh_fillFromAnalytic2_1] #! [PySnippet_MEDCouplingMesh_fillFromAnalytic2_2] @@ -531,9 +531,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingMesh_fillFromAnalytic(self): #! [PySnippet_MEDCouplingMesh_fillFromAnalytic_1] coords = [0.,2.,4.,6.] # 6. is not used - x=DataArrayDouble.New(coords[:3],3,1) - y=DataArrayDouble.New(coords[:2],2,1) - mesh=MEDCouplingCMesh.New() + x=DataArrayDouble(coords[:3],3,1) + y=DataArrayDouble(coords[:2],2,1) + mesh=MEDCouplingCMesh() mesh.setCoords(x,y) #! [PySnippet_MEDCouplingMesh_fillFromAnalytic_1] #! [PySnippet_MEDCouplingMesh_fillFromAnalytic_2] @@ -557,8 +557,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingCMesh_getCoordsAt(self): #! [PySnippet_MEDCouplingCMesh_getCoordsAt_1] coords = [1.,2.,4.] - x=DataArrayDouble.New(coords,3,1) - mesh=MEDCouplingCMesh.New() + x=DataArrayDouble(coords,3,1) + mesh=MEDCouplingCMesh() mesh.setCoordsAt(0,x) x2=mesh.getCoordsAt(0) assert coords == x2.getValues() @@ -567,20 +567,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_areCellsIncludedIn(self): #! [PySnippet_MEDCouplingUMesh_areCellsIncludedIn_1] - mesh1=MEDCouplingUMesh.New(); - mesh1.setMeshDimension(2); - mesh1.allocateCells(5); - conn=[0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4]; - mesh1.insertNextCell(NORM_QUAD4,4,conn[0:4]); # 0 - mesh1.insertNextCell(NORM_TRI3,3, conn[4:7]); # 1 - mesh1.insertNextCell(NORM_TRI3,3, conn[7:10]); # 2 - mesh1.insertNextCell(NORM_QUAD4,4,conn[10:14]); # 3 - mesh1.insertNextCell(NORM_QUAD4,4,conn[14:18]); # 4 - mesh1.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(); - coordsArr.setValues(coords,9,2); - mesh1.setCoords(coordsArr); + mesh1=MEDCouplingUMesh() + mesh1.setMeshDimension(2) + mesh1.allocateCells(5) + conn=[0,3,4,1, 1,2,4, 4,5,2, 6,7,4,3, 7,8,5,4] + mesh1.insertNextCell(NORM_QUAD4,4,conn[0:4]) # 0 + mesh1.insertNextCell(NORM_TRI3,3, conn[4:7]) # 1 + mesh1.insertNextCell(NORM_TRI3,3, conn[7:10]) # 2 + mesh1.insertNextCell(NORM_QUAD4,4,conn[10:14]) # 3 + mesh1.insertNextCell(NORM_QUAD4,4,conn[14:18]) # 4 + mesh1.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(coords,9,2) + mesh1.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_areCellsIncludedIn_1] #! [PySnippet_MEDCouplingUMesh_areCellsIncludedIn_2] cells2 = [ 4,2,0 ] @@ -601,9 +600,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells(self): #! [PySnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_1] # 2D coordinates of 5 base nodes - coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2]; - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,5,2); + coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2] + coordsArr=DataArrayDouble(coords,5,2) # coordinates of 5 top nodes coordsArr2 = coordsArr.deepCpy() # 3D coordinates of base + top nodes @@ -611,15 +609,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): coordsArr2 = coordsArr2.changeNbOfComponents( 3, 1 ) coordsArr = DataArrayDouble.Aggregate([coordsArr,coordsArr2]) # mesh - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); - mesh.setMeshDimension(3); - mesh.allocateCells(2); + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) + mesh.setMeshDimension(3) + mesh.allocateCells(2) # connectivity of reversed HEXA8 and PENTA6 conn=[0,1,4,3, 5,6,9,8, 1,2,4, 6,7,9] mesh.insertNextCell(NORM_HEXA8, 8,conn[0:0+8]) mesh.insertNextCell(NORM_PENTA6,6,conn[8:8+6]) - mesh.finishInsertingCells(); + mesh.finishInsertingCells() #! [PySnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_1] #! [PySnippet_MEDCouplingUMesh_findAndCorrectBadOriented3DExtrudedCells_2] fixedCells = mesh.findAndCorrectBadOriented3DExtrudedCells() @@ -632,9 +630,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented(self): #! [PySnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_1] # 2D coordinates of 5 base nodes - coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2]; - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,5,2); + coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2] + coordsArr=DataArrayDouble(coords,5,2) # coordinates of 5 top nodes coordsArr2 = coordsArr.deepCpy() # 3D coordinates of base + top nodes @@ -642,15 +639,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): coordsArr2 = coordsArr2.changeNbOfComponents( 3, 1 ) coordsArr = DataArrayDouble.Aggregate([coordsArr,coordsArr2]) # mesh - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); - mesh.setMeshDimension(3); - mesh.allocateCells(2); + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) + mesh.setMeshDimension(3) + mesh.allocateCells(2) # connectivity of a HEXA8 + a reversed PENTA6 conn=[0,3,4,1, 5,8,9,6, 1,2,4, 6,7,9] mesh.insertNextCell(NORM_POLYHED, 8,conn[0:0+8]) # "extruded" polyhedron mesh.insertNextCell(NORM_POLYHED,6,conn[8:8+6]) - mesh.finishInsertingCells(); + mesh.finishInsertingCells() # fix connectivity of NORM_POLYHED's mesh.convertExtrudedPolyhedra() #! [PySnippet_MEDCouplingUMesh_arePolyhedronsNotCorrectlyOriented_1] @@ -667,20 +664,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented(self): #! [PySnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) mesh.changeSpaceDimension(3) #! [PySnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_1] #! [PySnippet_MEDCouplingUMesh_are2DCellsNotCorrectlyOriented_2] @@ -697,20 +693,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getCellsContainingPoints(self): #! [PySnippet_MEDCouplingUMesh_getCellsContainingPoints_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getCellsContainingPoints_1] #! [PySnippet_MEDCouplingUMesh_getCellsContainingPoints_2] pos = [ 10., 10, # point out of the mesh @@ -726,20 +721,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getCellsContainingPoint(self): #! [PySnippet_MEDCouplingUMesh_getCellsContainingPoint_1] - mesh=MEDCouplingUMesh.New(); - 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]); - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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]) + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getCellsContainingPoint_1] #! [PySnippet_MEDCouplingUMesh_getCellsContainingPoint_2] pos4 = coords[ 4*2 : ] # coordinates of the node #4 @@ -753,20 +747,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildPartOrthogonalField(self): #! [PySnippet_MEDCouplingUMesh_buildPartOrthogonalField_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildPartOrthogonalField_1] #! [PySnippet_MEDCouplingUMesh_buildPartOrthogonalField_2] part = DataArrayInt([1,2,3,4],4,1) # cell #0 is omitted @@ -779,20 +772,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getPartMeasureField(self): #! [PySnippet_MEDCouplingUMesh_getPartMeasureField_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getPartMeasureField_1] #! [PySnippet_MEDCouplingUMesh_getPartMeasureField_2] isAbs = True @@ -813,16 +805,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getCellsInBoundingBox(self): #! [PySnippet_MEDCouplingUMesh_getCellsInBoundingBox_1] - mesh=MEDCouplingUMesh.New(); - mesh.setMeshDimension(2); - coords=[0.,0., 0.,1., 1.,1]; - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,3,2); - mesh.setCoords(coordsArr); - mesh.allocateCells(1); - conn=[0,1,2]; - mesh.insertNextCell(NORM_TRI3,3,conn); - mesh.finishInsertingCells(); + mesh=MEDCouplingUMesh() + mesh.setMeshDimension(2) + coords=[0.,0., 0.,1., 1.,1] + coordsArr=DataArrayDouble(coords,3,2) + mesh.setCoords(coordsArr) + mesh.allocateCells(1) + conn=[0,1,2] + mesh.insertNextCell(NORM_TRI3,3,conn) + mesh.finishInsertingCells() #! [PySnippet_MEDCouplingUMesh_getCellsInBoundingBox_1] #! [PySnippet_MEDCouplingUMesh_getCellsInBoundingBox_2] bbox = [1., 1., 1.001,1.001] # xMin, xMax, yMin, yMax @@ -835,12 +826,12 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_renumberNodesInConn(self): #! [PySnippet_MEDCouplingUMesh_renumberNodesInConn_1] - mesh=MEDCouplingUMesh.New(); - mesh.setMeshDimension(2); - mesh.allocateCells(1); - conn=[4,3,2,1]; - mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]); - mesh.finishInsertingCells(); + mesh=MEDCouplingUMesh() + mesh.setMeshDimension(2) + mesh.allocateCells(1) + conn=[4,3,2,1] + mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]) + mesh.finishInsertingCells() #! [PySnippet_MEDCouplingUMesh_renumberNodesInConn_1] #! [PySnippet_MEDCouplingUMesh_renumberNodesInConn_2] old2newIds = [-1,3,2,1,0] @@ -853,23 +844,22 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_renumberNodes(self): #! [PySnippet_MEDCouplingUMesh_renumberNodes_1] - mesh=MEDCouplingUMesh.New(); - mesh.setMeshDimension(2); - coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.3]; - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,4,2); - mesh.setCoords(coordsArr); - mesh.allocateCells(0); - mesh.finishInsertingCells(); + mesh=MEDCouplingUMesh() + mesh.setMeshDimension(2) + coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.3] + coordsArr=DataArrayDouble(coords,4,2) + mesh.setCoords(coordsArr) + mesh.allocateCells(0) + mesh.finishInsertingCells() #! [PySnippet_MEDCouplingUMesh_renumberNodes_1] #! [PySnippet_MEDCouplingUMesh_renumberNodes_2] - mesh.renumberNodes([ 2,1,0,-1 ], 3); + mesh.renumberNodes([ 2,1,0,-1 ], 3) coordsArr = mesh.getCoords() # get a shorten array assert coordsArr.getValues() == [0.7,-0.3, 0.2,-0.3, -0.3,-0.3] #! [PySnippet_MEDCouplingUMesh_renumberNodes_2] #! [PySnippet_MEDCouplingUMesh_renumberNodes_3] - coordsArr.setValues(coords,4,2); # restore old nodes - mesh.renumberNodes2([ 2,1,0,2 ], 3); + coordsArr.setValues(coords,4,2) # restore old nodes + mesh.renumberNodes2([ 2,1,0,2 ], 3) coordsArr = mesh.getCoords() # get a shorten array assert coordsArr.getValues() == [0.7,-0.3, 0.2,-0.3, -0.3,0.0] #! [PySnippet_MEDCouplingUMesh_renumberNodes_3] @@ -877,20 +867,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_findBoundaryNodes(self): #! [PySnippet_MEDCouplingUMesh_findBoundaryNodes_1] - mesh=MEDCouplingUMesh.New(); - 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]); - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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]) + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_findBoundaryNodes_1] #! [PySnippet_MEDCouplingUMesh_findBoundaryNodes_2] nodeIdsArr=mesh.findBoundaryNodes() @@ -900,20 +889,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildBoundaryMesh(self): #! [PySnippet_MEDCouplingUMesh_buildBoundaryMesh_1] - mesh=MEDCouplingUMesh.New(); - 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]); - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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]) + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildBoundaryMesh_1] #! [PySnippet_MEDCouplingUMesh_buildBoundaryMesh_2] mesh1=mesh.buildBoundaryMesh(True) @@ -925,20 +913,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildFacePartOfMySelfNode(self): #! [PySnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_1] #! [PySnippet_MEDCouplingUMesh_buildFacePartOfMySelfNode_2] nodeIds = mesh.getNodeIdsOfCell( 0 ) @@ -953,20 +940,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildPartOfMySelfNode(self): #! [PySnippet_MEDCouplingUMesh_buildPartOfMySelfNode_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildPartOfMySelfNode_1] #! [PySnippet_MEDCouplingUMesh_buildPartOfMySelfNode_2] nodeIds = mesh.getNodeIdsOfCell( 0 ) @@ -981,20 +967,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getCellIdsLyingOnNodes(self): #! [PySnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_1] #! [PySnippet_MEDCouplingUMesh_getCellIdsLyingOnNodes_2] nodeIds = mesh.getNodeIdsOfCell( 0 ) @@ -1009,20 +994,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds(self): #! [PySnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_1] - mesh=MEDCouplingUMesh.New(); - 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]); - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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]) + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_1] #! [PySnippet_MEDCouplingUMesh_getCellIdsFullyIncludedInNodeIds_2] cellIds = [1,2] @@ -1036,20 +1020,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildPartOfMySelf(self): #! [PySnippet_MEDCouplingUMesh_buildPartOfMySelf_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildPartOfMySelf_1] #! [PySnippet_MEDCouplingUMesh_buildPartOfMySelf_2] cellIds=[1,2] @@ -1066,23 +1049,22 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_mergeNodes(self): #! [PySnippet_MEDCouplingUMesh_mergeNodes_1] - mesh=MEDCouplingUMesh.New(); - mesh.setMeshDimension(2); - mesh.allocateCells(5); - conn=[0,3,4,1, 1,4,2, 4,5,2]; - 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.finishInsertingCells(); + mesh=MEDCouplingUMesh() + mesh.setMeshDimension(2) + mesh.allocateCells(5) + conn=[0,3,4,1, 1,4,2, 4,5,2] + 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.finishInsertingCells() coords=[0.3,-0.301, # 0 0.2,-0.3, # 1 0.3,-0.302, # 2 ~~ 0 1.1,0.0, # 3 1.1,0.0, # 4 == 3 - 0.3,-0.303];# 5 ~~ 0 - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,6,2); - mesh.setCoords(coordsArr); + 0.3,-0.303]# 5 ~~ 0 + coordsArr=DataArrayDouble(coords,6,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_mergeNodes_1] #! [PySnippet_MEDCouplingUMesh_mergeNodes_2] arr,areNodesMerged,newNbOfNodes=mesh.mergeNodes(0.004) @@ -1095,8 +1077,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): coordsArr = mesh.getCoords() # retrieve a new shorten coord array self.assertNotAlmostEqual( baryCoords2[1], coordsArr.getIJ(0,1), 13 ) # Y of node #0 differs from that of baryCoords2 # restore coordinates - coordsArr = DataArrayDouble(coords,6,2); - mesh.setCoords(coordsArr); + coordsArr = DataArrayDouble(coords,6,2) + mesh.setCoords(coordsArr) # call mergeNodes2() mesh.mergeNodes2(0.004) coordsArr = mesh.getCoords() # retrieve a new shorten coord array @@ -1106,20 +1088,19 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_zipConnectivityTraducer(self): #! [PySnippet_MEDCouplingUMesh_zipConnectivityTraducer_1] - mesh=MEDCouplingUMesh.New(); - mesh.setMeshDimension(2); - mesh.allocateCells(5); - conn=[0,3,4,1, 1,4,2]; - mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]); # 0 - mesh.insertNextCell(NORM_TRI3,3, conn[4:7]); # 1 - mesh.insertNextCell(NORM_TRI3,3, conn[4:7]); # 2 == 1 - mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]); # 3 == 0 - mesh.insertNextCell(NORM_QUAD4,4,conn[2:4]+conn[0:2]); # 4 ~~ 0 - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + mesh.setMeshDimension(2) + mesh.allocateCells(5) + conn=[0,3,4,1, 1,4,2] + mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]) # 0 + mesh.insertNextCell(NORM_TRI3,3, conn[4:7]) # 1 + mesh.insertNextCell(NORM_TRI3,3, conn[4:7]) # 2 == 1 + mesh.insertNextCell(NORM_QUAD4,4,conn[0:4]) # 3 == 0 + mesh.insertNextCell(NORM_QUAD4,4,conn[2:4]+conn[0:2]) # 4 ~~ 0 + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_zipConnectivityTraducer_1] #! [PySnippet_MEDCouplingUMesh_zipConnectivityTraducer_2] oldNbCells = mesh.getNumberOfCells() @@ -1131,25 +1112,24 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_zipCoordsTraducer(self): #! [PySnippet_MEDCouplingUMesh_zipCoordsTraducer_1] - mesh=MEDCouplingUMesh.New(); - 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]); - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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]) + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_zipCoordsTraducer_1] #! [PySnippet_MEDCouplingUMesh_zipCoordsTraducer_2] cellIds=[1,2] - mesh2=mesh.buildPartOfMySelf(cellIds,True); - arr=mesh2.zipCoordsTraducer(); + mesh2=mesh.buildPartOfMySelf(cellIds,True) + arr=mesh2.zipCoordsTraducer() assert mesh2.getNumberOfNodes() == 4 # nb of nodes decreased assert arr.getValues() == [-1,0,1,-1,2,3,-1,-1,-1] # -1 for unused nodes #! [PySnippet_MEDCouplingUMesh_zipCoordsTraducer_2] @@ -1157,53 +1137,51 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getNodeIdsInUse(self): #! [PySnippet_MEDCouplingUMesh_getNodeIdsInUse_1] - mesh=MEDCouplingUMesh.New(); - 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]); - 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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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]) + 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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getNodeIdsInUse_1] #! [PySnippet_MEDCouplingUMesh_getNodeIdsInUse_2] cellIds=[1,2] - mesh2=mesh.buildPartOfMySelf(cellIds,True); - arr,newNbOfNodes=mesh2.getNodeIdsInUse(); + mesh2=mesh.buildPartOfMySelf(cellIds,True) + arr,newNbOfNodes=mesh2.getNodeIdsInUse() assert arr.getValues() == [-1,0,1,-1,2,3,-1,-1,-1] #! [PySnippet_MEDCouplingUMesh_getNodeIdsInUse_2] #! [PySnippet_MEDCouplingUMesh_getNodeIdsInUse_3] - arr2=arr.invertArrayO2N2N2O(newNbOfNodes); + arr2=arr.invertArrayO2N2N2O(newNbOfNodes) assert arr2.getValues() == [1,2,4,5] #! [PySnippet_MEDCouplingUMesh_getNodeIdsInUse_3] return def testExample_MEDCouplingUMesh_convertToPolyTypes(self): #! [PySnippet_MEDCouplingUMesh_convertToPolyTypes_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_convertToPolyTypes_1] #! [PySnippet_MEDCouplingUMesh_convertToPolyTypes_2] - cells=[1,3]; - mesh.convertToPolyTypes(cells); + cells=[1,3] + mesh.convertToPolyTypes(cells) assert mesh.getTypeOfCell(0) == NORM_QUAD4 assert mesh.getTypeOfCell(1) == NORM_POLYGON, mesh.getTypeOfCell(1) assert mesh.getTypeOfCell(2) == NORM_TRI3 @@ -1213,27 +1191,22 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildDescendingConnectivity2(self): #! [PySnippet_MEDCouplingUMesh_buildDescendingConnectivity2_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildDescendingConnectivity2_1] #! [PySnippet_MEDCouplingUMesh_buildDescendingConnectivity2_2] - desc=DataArrayInt.New(); - descIndx=DataArrayInt.New(); - revDesc=DataArrayInt.New(); - revDescIndx=DataArrayInt.New(); - mesh2=mesh.buildDescendingConnectivity2(desc,descIndx,revDesc,revDescIndx); + mesh2,desc,descIndx,revDesc,revDescIndx=mesh.buildDescendingConnectivity2() assert desc.getValues() == [1,2,3,4,-3,5,6, 7,8,-5,9,10,-2,11, 12,13,-7,-10] assert descIndx.getValues() == [0,4,7,10,14,18] assert revDesc.getValues() == [0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4] @@ -1246,27 +1219,22 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_buildDescendingConnectivity(self): #! [PySnippet_MEDCouplingUMesh_buildDescendingConnectivity_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_buildDescendingConnectivity_1] #! [PySnippet_MEDCouplingUMesh_buildDescendingConnectivity_2] - desc=DataArrayInt.New(); - descIndx=DataArrayInt.New(); - revDesc=DataArrayInt.New(); - revDescIndx=DataArrayInt.New(); - mesh2=mesh.buildDescendingConnectivity(desc,descIndx,revDesc,revDescIndx); + mesh2,desc,descIndx,revDesc,revDescIndx=mesh.buildDescendingConnectivity() assert desc.getValues() == [0,1,2,3, 2,4,5, 6,7,4, 8,9,1,10, 11,12,6,9] assert descIndx.getValues() == [0,4,7,10,14,18] assert revDesc.getValues() == [0, 0,3, 0,1, 0, 1,2, 1, 2,4, 2, 3, 3,4, 3, 4, 4] @@ -1276,56 +1244,55 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingUMesh_getReverseNodalConnectivity(self): #! [PySnippet_MEDCouplingUMesh_getReverseNodalConnectivity_1] - mesh=MEDCouplingUMesh.New(); - 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.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(); - coordsArr.setValues(coords,9,2); - mesh.setCoords(coordsArr); + mesh=MEDCouplingUMesh() + 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.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(coords,9,2) + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingUMesh_getReverseNodalConnectivity_1] #! [PySnippet_MEDCouplingUMesh_getReverseNodalConnectivity_2] - revNodal,revNodalIndx=mesh.getReverseNodalConnectivity(); - assert revNodal.getValues() == [0,0,1,1,2,0,3,0,1,2,3,4,2,4,3,3,4,4]; - assert revNodalIndx.getValues() == [0,1,3,5,7,12,14,15,17,18]; + revNodal,revNodalIndx=mesh.getReverseNodalConnectivity() + assert revNodal.getValues() == [0,0,1,1,2,0,3,0,1,2,3,4,2,4,3,3,4,4] + assert revNodalIndx.getValues() == [0,1,3,5,7,12,14,15,17,18] #! [PySnippet_MEDCouplingUMesh_getReverseNodalConnectivity_2] return def testExample_MEDCouplingUMesh_checkDeepEquivalWith(self): #! [PySnippet_MEDCouplingUMesh_checkDeepEquivalWith_1] # mesh 1 - mesh1=MEDCouplingUMesh.New(); - mesh1.setMeshDimension(2); + mesh1=MEDCouplingUMesh() + mesh1.setMeshDimension(2) coords=[0.0,0.0, #0 1.0,0.0, #1 1.0,1.0, #2 0.0,1.0] #3 - coordsArr=DataArrayDouble.New(coords,4,2); - mesh1.setCoords(coordsArr); - mesh1.allocateCells(2); - mesh1.insertNextCell(NORM_TRI3,3,[0,1,2]); #0 - mesh1.insertNextCell(NORM_TRI3,3,[1,2,3]); #1 - mesh1.finishInsertingCells(); + coordsArr=DataArrayDouble(coords,4,2) + mesh1.setCoords(coordsArr) + mesh1.allocateCells(2) + mesh1.insertNextCell(NORM_TRI3,3,[0,1,2]) #0 + mesh1.insertNextCell(NORM_TRI3,3,[1,2,3]) #1 + mesh1.finishInsertingCells() # mesh 2 - mesh2=MEDCouplingUMesh.New(); - mesh2.setMeshDimension(2); + mesh2=MEDCouplingUMesh() + mesh2.setMeshDimension(2) coords=[0.0,1.0, #0 = #3 0.0,0.0, #1 = #0 1.0,0.0, #2 = #1 1.0,1.001] #3 ~ #2 - coordsArr2=DataArrayDouble.New(coords,4,2) - mesh2.setCoords(coordsArr2); - mesh2.allocateCells(2); - mesh2.insertNextCell(NORM_TRI3,3,[2,3,0]); #0 = #1 - mesh2.insertNextCell(NORM_TRI3,3,[3,1,2]); #1 ~ #0 - mesh2.finishInsertingCells(); + coordsArr2=DataArrayDouble(coords,4,2) + mesh2.setCoords(coordsArr2) + mesh2.allocateCells(2) + mesh2.insertNextCell(NORM_TRI3,3,[2,3,0]) #0 = #1 + mesh2.insertNextCell(NORM_TRI3,3,[3,1,2]) #1 ~ #0 + mesh2.finishInsertingCells() #! [PySnippet_MEDCouplingUMesh_checkDeepEquivalWith_1] #! [PySnippet_MEDCouplingUMesh_checkDeepEquivalWith_2] cellCompPol = 1 # "permuted same orientation" - policy of medium severity @@ -1336,10 +1303,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingUMesh_checkDeepEquivalWith_3] self.assertRaises( InterpKernelException, mesh1.checkDeepEquivalOnSameNodesWith, mesh2, cellCompPol, 0.002) mesh2.setCoords(coordsArr) # make meshes share the same coordinates array - mesh2.allocateCells(2); - mesh2.insertNextCell(NORM_TRI3,3,[1,2,3]); #0 = #1 - mesh2.insertNextCell(NORM_TRI3,3,[1,0,2]); #1 ~ #0 - mesh2.finishInsertingCells(); + mesh2.allocateCells(2) + mesh2.insertNextCell(NORM_TRI3,3,[1,2,3]) #0 = #1 + mesh2.insertNextCell(NORM_TRI3,3,[1,0,2]) #1 ~ #0 + mesh2.finishInsertingCells() cellCompPol = 2 # the weakest policy mesh1.checkDeepEquivalOnSameNodesWith( mesh2, cellCompPol, 0 ) #! [PySnippet_MEDCouplingUMesh_checkDeepEquivalWith_3] @@ -1348,10 +1315,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingPointSet_scale(self): #! [PySnippet_MEDCouplingPointSet_scale_1] coords=[0.0,0.0, 1.0,0.0, 1.0,1.0, 0.0,1.0] # 2D coordinates of 4 nodes - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,4,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + coordsArr=DataArrayDouble(coords,4,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) initCoords = coordsArr.deepCpy() #! [PySnippet_MEDCouplingPointSet_scale_1] #! [PySnippet_MEDCouplingPointSet_scale_2] @@ -1369,10 +1335,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingPointSet_translate(self): #! [PySnippet_MEDCouplingPointSet_translate_1] coords=[0.0,0.0, 1.0,0.0, 1.0,1.0, 0.0,1.0] # 2D coordinates of 4 nodes - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,4,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + coordsArr=DataArrayDouble(coords,4,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) initCoords = coordsArr.deepCpy() #! [PySnippet_MEDCouplingPointSet_translate_1] #! [PySnippet_MEDCouplingPointSet_translate_2] @@ -1389,10 +1354,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingPointSet_rotate(self): #! [PySnippet_MEDCouplingPointSet_rotate_1] coords=[0.0,0.0, 0.1,0.0, 0.1,0.1, 0.0,0.1] # 2D coordinates of 4 nodes - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,4,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + coordsArr=DataArrayDouble(coords,4,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingPointSet_rotate_1] #! [PySnippet_MEDCouplingPointSet_rotate_2] center = [0.,0.] @@ -1416,10 +1380,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): #! [PySnippet_MEDCouplingPointSet_getBoundingBox_1] cc=[0.0, 0.1, 0.2, # 3D coordinates of 2 nodes 2.0, 2.1, 2.2] - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(cc,2,3); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + coordsArr=DataArrayDouble(cc,2,3) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingPointSet_getBoundingBox_1] #! [PySnippet_MEDCouplingPointSet_getBoundingBox_2] bbox=mesh.getBoundingBox() @@ -1435,15 +1398,14 @@ class MEDCouplingBasicsTest(unittest.TestCase): 0.2,-0.3, # 1 0.3,-0.302, # 2 1.1,0.0, # 3 - 0.3,-0.30299999999999];# 4 - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,5,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + 0.3,-0.30299999999999]# 4 + coordsArr=DataArrayDouble(coords,5,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingPointSet_getNodeIdsNearPoint_1] #! [PySnippet_MEDCouplingPointSet_getNodeIdsNearPoint_2] point=[0.3, -0.3] # point close to nodes #0, #2 and #4 - ids=mesh.getNodeIdsNearPoint(point,0.003); + ids=mesh.getNodeIdsNearPoint(point,0.003) assert ids.getValues() == [0,2,4] #! [PySnippet_MEDCouplingPointSet_getNodeIdsNearPoint_2] return @@ -1457,17 +1419,16 @@ class MEDCouplingBasicsTest(unittest.TestCase): 1.1,0.0, # 3 1.1,0.0, # 4 1.1,0.002, # 5 - 0.3,-0.303];# 6 - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,7,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + 0.3,-0.303]# 6 + coordsArr=DataArrayDouble(coords,7,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingPointSet_getNodeIdsNearPoints_1] #! [PySnippet_MEDCouplingPointSet_getNodeIdsNearPoints_2] points=[0.2,-0.301, # ~ node #1 0.0, 0.0, 1.1, 0.002] # ~ nodes #3, #4 and #5 - ids,idsIndex=mesh.getNodeIdsNearPoints(points,3,0.003); + ids,idsIndex=mesh.getNodeIdsNearPoints(points,3,0.003) assert ids.getValues() == [1, 3, 4, 5] assert idsIndex.getValues() == [0, 1, 1, 4] #! [PySnippet_MEDCouplingPointSet_getNodeIdsNearPoints_2] @@ -1480,11 +1441,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): 0.3,-0.302, # 2 1.1,0.0, # 3 1.1,0.0, # 4 - 0.3,-0.303];# 5 - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,6,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + 0.3,-0.303]# 5 + coordsArr=DataArrayDouble(coords,6,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingPointSet_findCommonNodes_1] #! [PySnippet_MEDCouplingPointSet_findCommonNodes_2] comm,commI=mesh.findCommonNodes(1e-13) @@ -1496,22 +1456,21 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_MEDCouplingPointSet_getCoordinatesOfNode(self): #! [PySnippet_MEDCouplingPointSet_getCoordinatesOfNode_1] - coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3]; - coordsArr=DataArrayDouble.New(); - coordsArr.setValues(coords,3,2); - mesh=MEDCouplingUMesh.New(); - mesh.setCoords(coordsArr); + coords=[-0.3,-0.3, 0.2,-0.3, 0.7,-0.3] + coordsArr=DataArrayDouble(coords,3,2) + mesh=MEDCouplingUMesh() + mesh.setCoords(coordsArr) #! [PySnippet_MEDCouplingPointSet_getCoordinatesOfNode_1] #! [PySnippet_MEDCouplingPointSet_getCoordinatesOfNode_2] nodeCoords=mesh.getCoordinatesOfNode(1) - self.assertAlmostEqual(0.2, nodeCoords[0],13); - self.assertAlmostEqual(-0.3,nodeCoords[1],13); + self.assertAlmostEqual(0.2, nodeCoords[0],13) + self.assertAlmostEqual(-0.3,nodeCoords[1],13) #! [PySnippet_MEDCouplingPointSet_getCoordinatesOfNode_2] return def testExample_DataArrayInt_getTuple(self): #! [Snippet_DataArrayInt_getTuple_1] - dv=DataArrayInt.New(); + dv=DataArrayInt() dv.alloc( 6, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1525,9 +1484,9 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_buildPermutationArr(self): #! [PySnippet_DataArrayInt_buildPermutationArr_1] - a=DataArrayInt.New() + a=DataArrayInt() a.setValues([4,5,6,7,8],5,1) - b=DataArrayInt.New() + b=DataArrayInt() b.setValues([5,4,8,6,7],5,1) c=a.buildPermutationArr(b) #! [PySnippet_DataArrayInt_buildPermutationArr_1] @@ -1537,12 +1496,12 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_invertArrayO2N2N2O(self): #! [PySnippet_DataArrayInt_invertArrayO2N2N2O_1] arr1=[2,0,4,1,5,3] - da=DataArrayInt.New(); - da.setValues(arr1,6,1); - da2=da.invertArrayO2N2N2O(6); + da=DataArrayInt() + da.setValues(arr1,6,1) + da2=da.invertArrayO2N2N2O(6) expected1=[1,3,0,5,2,4] for i in xrange(6): - self.assertEqual(expected1[i],da2.getIJ(i,0)); + self.assertEqual(expected1[i],da2.getIJ(i,0)) pass #! [PySnippet_DataArrayInt_invertArrayO2N2N2O_1] return @@ -1550,12 +1509,12 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_invertArrayN2O2O2N(self): #! [PySnippet_DataArrayInt_invertArrayN2O2O2N_1] arr1=[2,0,4,1,5,3] - da=DataArrayInt.New(); - da.setValues(arr1,6,1); - da2=da.invertArrayN2O2O2N(7); + da=DataArrayInt() + da.setValues(arr1,6,1) + da2=da.invertArrayN2O2O2N(7) expected1=[1,3,0,5,2,4,-1] for i in xrange(6): - self.assertEqual(expected1[i],da2.getIJ(i,0)); + self.assertEqual(expected1[i],da2.getIJ(i,0)) pass #! [PySnippet_DataArrayInt_invertArrayN2O2O2N_1] return @@ -1563,7 +1522,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_getIdsInRange(self): #! [PySnippet_DataArrayDouble_getIdsInRange_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 10, 1 ) da[ :, :] = range(10) da2 = da.getIdsInRange( 2.5, 6 ) @@ -1572,10 +1531,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setPartOfValues2(self): #! [Snippet_DataArrayDouble_setPartOfValues2_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 4, 7 ) # - dv=DataArrayDouble.New(); + dv=DataArrayDouble() dv.alloc( 6, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1593,10 +1552,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setPartOfValues2(self): #! [Snippet_DataArrayInt_setPartOfValues2_1] - da=DataArrayInt.New() + da=DataArrayInt() da.alloc( 4, 7 ) # - dv=DataArrayInt.New(); + dv=DataArrayInt() dv.alloc( 6, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1614,10 +1573,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setPartOfValues3(self): #! [Snippet_DataArrayDouble_setPartOfValues3_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 4, 7 ) # - dv=DataArrayDouble.New(); + dv=DataArrayDouble() dv.alloc( 6, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1635,10 +1594,10 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setPartOfValues3(self): #! [Snippet_DataArrayInt_setPartOfValues3_1] - da=DataArrayInt.New() + da=DataArrayInt() da.alloc( 4, 7 ) # - dv=DataArrayInt.New(); + dv=DataArrayInt() dv.alloc( 6, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1656,11 +1615,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setPartOfValues1(self): #! [Snippet_DataArrayDouble_setPartOfValues1_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 4, 4 ) da.setInfoOnComponents( ["v1","v2","v3","v4"]) # - dv=DataArrayDouble.New(); + dv=DataArrayDouble() dv.alloc( 4, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1692,11 +1651,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setPartOfValues1(self): #! [Snippet_DataArrayInt_setPartOfValues1_1] - da=DataArrayInt.New() + da=DataArrayInt() da.alloc( 4, 4 ) da.setInfoOnComponents( ["v1","v2","v3","v4"]) # - dv=DataArrayInt.New(); + dv=DataArrayInt() dv.alloc( 4, 1 ) dv.iota(7) dv.rearrange( 2 ) @@ -1728,7 +1687,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setPartOfValuesSimple1(self): #! [Snippet_DataArrayDouble_setPartOfValuesSimple1_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 4, 4 ) dv = 7 #! [Snippet_DataArrayDouble_setPartOfValuesSimple1_1] @@ -1758,7 +1717,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setPartOfValuesSimple1(self): #! [Snippet_DataArrayInt_setPartOfValuesSimple1_1] - da=DataArrayInt.New() + da=DataArrayInt() da.alloc( 4, 4 ) dv = 7 #! [Snippet_DataArrayInt_setPartOfValuesSimple1_1] @@ -1788,7 +1747,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setPartOfValuesSimple2(self): #! [Snippet_DataArrayDouble_setPartOfValuesSimple2_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 4, 4 ) dv = 7 #! [Snippet_DataArrayDouble_setPartOfValuesSimple2_1] @@ -1812,7 +1771,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setPartOfValuesSimple2(self): #! [Snippet_DataArrayInt_setPartOfValuesSimple2_1] - da=DataArrayInt.New() + da=DataArrayInt() da.alloc( 4, 4 ) dv = 7 #! [Snippet_DataArrayInt_setPartOfValuesSimple2_1] @@ -1836,7 +1795,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setPartOfValuesSimple3(self): #! [Snippet_DataArrayDouble_setPartOfValuesSimple3_1] - da=DataArrayDouble.New() + da=DataArrayDouble() da.alloc( 4, 4 ) dv = 7 #! [Snippet_DataArrayDouble_setPartOfValuesSimple3_1] @@ -1860,7 +1819,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setPartOfValuesSimple3(self): #! [Snippet_DataArrayInt_setPartOfValuesSimple3_1] - da=DataArrayInt.New() + da=DataArrayInt() da.alloc( 4, 4 ) dv = 7 #! [Snippet_DataArrayInt_setPartOfValuesSimple3_1] @@ -1884,13 +1843,12 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_setSelectedComponents(self): #! [Snippet_DataArrayDouble_setSelectedComponents1] - da=DataArrayDouble.New(); array1=[1.,2., 3.,4., 5.,6.] - da.setValues(array1,3,2) + da=DataArrayDouble(array1,3,2) da.setInfoOnComponents( ["a1","a2"]) #! [Snippet_DataArrayDouble_setSelectedComponents1] #! [Snippet_DataArrayDouble_setSelectedComponents2] - dv=DataArrayDouble.New(); + dv=DataArrayDouble() dv.alloc( 4, 4 ) dv.fillWithZero() dv.setInfoOnComponents( ["v1","v2","v3","v4"]) @@ -1905,13 +1863,13 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayInt_setSelectedComponents(self): #! [Snippet_DataArrayInt_setSelectedComponents1] - da=DataArrayInt.New(); + da=DataArrayInt() array1=[1,2, 3,4, 5,6] da.setValues(array1,3,2) da.setInfoOnComponents( ["a1","a2"]) #! [Snippet_DataArrayInt_setSelectedComponents1] #! [Snippet_DataArrayInt_setSelectedComponents2] - dv=DataArrayInt.New(); + dv=DataArrayInt() dv.alloc( 4, 4 ) dv.fillWithZero() dv.setInfoOnComponents( ["v1","v2","v3","v4"]) @@ -1926,27 +1884,25 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExample_DataArrayDouble_getDifferentValues(self): #! [Snippet_DataArrayDouble_getDifferentValues1] - da=DataArrayDouble.New(); array1=[2.3,1.2,1.3,2.3,2.301,0.8] - da.setValues(array1,6,1) + da=DataArrayDouble(array1,6,1) # - dv=da.getDifferentValues(2e-1); + dv=da.getDifferentValues(2e-1) expected2=[2.301,1.3,0.8] - self.assertEqual(3,dv.getNbOfElems()); + self.assertEqual(3,dv.getNbOfElems()) for i in xrange(3): - self.assertAlmostEqual(expected2[i],dv.getIJ(i,0),14); + self.assertAlmostEqual(expected2[i],dv.getIJ(i,0),14) pass #! [Snippet_DataArrayDouble_getDifferentValues1] return def testExample_DataArrayDouble_findCommonTuples1(self): #! [PySnippet_DataArrayDouble_findCommonTuples1] - da=DataArrayDouble.New(); array2=[2.3,2.3, 1.2,1.2, 1.3,1.3, 2.3,2.3, 2.301,2.301, 0.8,0.8] - da.setValues(array2,6,2) + da=DataArrayDouble(array2,6,2) #! [PySnippet_DataArrayDouble_findCommonTuples1] #! [PySnippet_DataArrayDouble_findCommonTuples2] - c,cI=da.findCommonTuples(1.01e-1); + c,cI=da.findCommonTuples(1.01e-1) expected3=[0,3,4,1,2] expected4=[0,3,5] self.assertEqual(expected3,c.getValues()) @@ -1956,40 +1912,40 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExampleDataArrayDoubleMeldWith(self): #! [PySnippet_DataArrayDouble_Meld1_1] - da1=DataArrayDouble.New(); - da1.alloc(7,2); - da2=DataArrayDouble.New(); - da2.alloc(7,1); + da1=DataArrayDouble() + da1.alloc(7,2) + da2=DataArrayDouble() + da2.alloc(7,1) # - da1.fillWithValue(7.); - da2.iota(0.); - da3=da2.applyFunc(3,"10*x*IVec+100*x*JVec+1000*x*KVec"); + da1.fillWithValue(7.) + da2.iota(0.) + da3=da2.applyFunc(3,"10*x*IVec+100*x*JVec+1000*x*KVec") # - da1.setInfoOnComponent(0,"c0da1"); - da1.setInfoOnComponent(1,"c1da1"); - da3.setInfoOnComponent(0,"c0da3"); - da3.setInfoOnComponent(1,"c1da3"); - da3.setInfoOnComponent(2,"c2da3"); + da1.setInfoOnComponent(0,"c0da1") + da1.setInfoOnComponent(1,"c1da1") + da3.setInfoOnComponent(0,"c0da3") + da3.setInfoOnComponent(1,"c1da3") + da3.setInfoOnComponent(2,"c2da3") # - da1C=da1.deepCpy(); - da1.meldWith(da3); + da1C=da1.deepCpy() + da1.meldWith(da3) #! [PySnippet_DataArrayDouble_Meld1_1] def testExampleDataArrayIntMeldWith(self): #! [PySnippet_DataArrayInt_Meld1_1] - da1=DataArrayInt.New(); - da1.alloc(7,2); - da2=DataArrayInt.New(); - da2.alloc(7,1); + da1=DataArrayInt() + da1.alloc(7,2) + da2=DataArrayInt() + da2.alloc(7,1) # - da1.fillWithValue(7); - da2.iota(0); + da1.fillWithValue(7) + da2.iota(0) # - da1.setInfoOnComponent(0,"c0da1"); - da1.setInfoOnComponent(1,"c1da1"); - da2.setInfoOnComponent(0,"c0da2"); + da1.setInfoOnComponent(0,"c0da1") + da1.setInfoOnComponent(1,"c1da1") + da2.setInfoOnComponent(0,"c0da2") # - da1.meldWith(da2); + da1.meldWith(da2) #! [PySnippet_DataArrayInt_Meld1_1] def testExampleDataArrayDoubleKeepSelectedComponents1(self): @@ -1999,12 +1955,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): 21.,22.,23.,24., # ... 31.,32.,33.,34., 41.,42.,43.,44.] - a1=DataArrayDouble.New() - a1.setValues(arr1,5,4) - a1.setInfoOnComponent(0,"a"); - a1.setInfoOnComponent(1,"b"); - a1.setInfoOnComponent(2,"c"); - a1.setInfoOnComponent(3,"d"); + a1=DataArrayDouble(arr1,5,4) + a1.setInfoOnComponent(0,"a") + a1.setInfoOnComponent(1,"b") + a1.setInfoOnComponent(2,"c") + a1.setInfoOnComponent(3,"d") #! [SnippeDataArrayDoubleKeepSelectedComponents1_1] #! [SnippeDataArrayDoubleKeepSelectedComponents1_2] arr2V=[1,2,1,2,0,0] @@ -2019,12 +1974,12 @@ class MEDCouplingBasicsTest(unittest.TestCase): 21,22,23,24, # 31,32,33,34, 41,42,43,44] - a1=DataArrayInt.New() + a1=DataArrayInt() a1.setValues(arr1,5,4) - a1.setInfoOnComponent(0,"a"); - a1.setInfoOnComponent(1,"b"); - a1.setInfoOnComponent(2,"c"); - a1.setInfoOnComponent(3,"d"); + a1.setInfoOnComponent(0,"a") + a1.setInfoOnComponent(1,"b") + a1.setInfoOnComponent(2,"c") + a1.setInfoOnComponent(3,"d") #! [SnippeDataArrayIntKeepSelectedComponents1_1] #! [SnippeDataArrayIntKeepSelectedComponents1_2] arr2V=[1,2,1,2,0,0] @@ -2039,12 +1994,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): from MEDCouplingDataForTest import MEDCouplingDataForTest #! [PySnippetFieldDoubleBuildSubPart1_1] mesh1=MEDCouplingDataForTest.build2DTargetMesh_1() - f1=MEDCouplingFieldDouble.New(ON_CELLS,ONE_TIME) + f1=MEDCouplingFieldDouble(ON_CELLS,ONE_TIME) f1.setTime(2.3,5,6) f1.setMesh(mesh1) - array=DataArrayDouble.New() arr1=[3.,103.,4.,104.,5.,105.,6.,106.,7.,107.] - array.setValues(arr1,mesh1.getNumberOfCells(),2) + array=DataArrayDouble(arr1,mesh1.getNumberOfCells(),2) f1.setArray(array) # ! [PySnippetFieldDoubleBuildSubPart1_1] # ! [PySnippetFieldDoubleBuildSubPart1_2] @@ -2074,12 +2028,11 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertEqual(expected4,list(m2C.getNodalConnectivityIndex().getValues())) # Test with field on nodes. # ! [PySnippetFieldDoubleBuildSubPart1_3] - f1=MEDCouplingFieldDouble.New(ON_NODES,ONE_TIME) + f1=MEDCouplingFieldDouble(ON_NODES,ONE_TIME) f1.setTime(2.3,5,6) f1.setMesh(mesh1) - array=DataArrayDouble.New() arr2=[3.,103.,4.,104.,5.,105.,6.,106.,7.,107.,8.,108.,9.,109.,10.,110.,11.,111.] - array.setValues(arr2,mesh1.getNumberOfNodes(),2) + array=DataArrayDouble(arr2,mesh1.getNumberOfNodes(),2) f1.setArray(array) # ! [PySnippetFieldDoubleBuildSubPart1_3] # ! [PySnippetFieldDoubleBuildSubPart1_4] @@ -2106,7 +2059,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): 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() + arrr=DataArrayInt() arrr.setValues(part3,2,1) f2=f1.buildSubPart(arrr) self.assertEqual(4,f2.getNumberOfTuples()) @@ -2158,7 +2111,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): nodalConnPerCell=[0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4] # ! [PySnippetUMeshStdBuild1_1] # ! [PySnippetUMeshStdBuild1_2] - mesh=MEDCouplingUMesh.New("My2DMesh",2) + mesh=MEDCouplingUMesh("My2DMesh",2) # ! [PySnippetUMeshStdBuild1_2] # ! [PySnippetUMeshStdBuild1_3] mesh.allocateCells(5)#You can put more than 5 if you want but not less. @@ -2170,7 +2123,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): mesh.finishInsertingCells() # ! [PySnippetUMeshStdBuild1_3] # ! [PySnippetUMeshStdBuild1_4] - coordsArr=DataArrayDouble.New(coords,9,3)#here coordsArr are declared to have 3 components, mesh will deduce that its spaceDim==3. + coordsArr=DataArrayDouble(coords,9,3)#here coordsArr are declared to have 3 components, mesh will deduce that its spaceDim==3. mesh.setCoords(coordsArr)#coordsArr contains 9 tuples, that is to say mesh contains 9 nodes. # ! [PySnippetUMeshStdBuild1_4] # ! [PySnippetUMeshStdBuild1_5] @@ -2182,13 +2135,13 @@ class MEDCouplingBasicsTest(unittest.TestCase): # ! [PySnippetCMeshStdBuild1_1] XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22] # 9 values along X YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007] # 7 values along Y - arrX=DataArrayDouble.New(XCoords) + arrX=DataArrayDouble(XCoords) arrX.setInfoOnComponent(0,"X [m]") - arrY=DataArrayDouble.New(YCoords) + arrY=DataArrayDouble(YCoords) arrY.setInfoOnComponent(0,"Y [m]") # ! [PySnippetCMeshStdBuild1_1] # ! [PySnippetCMeshStdBuild1_2] - mesh=MEDCouplingCMesh.New("My2D_CMesh") + mesh=MEDCouplingCMesh("My2D_CMesh") mesh.setCoords(arrX,arrY) # ! [PySnippetCMeshStdBuild1_2] # ! [PySnippetCMeshStdBuild1_3] @@ -2197,7 +2150,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertEqual(2,mesh.getSpaceDimension()) self.assertEqual(2,mesh.getMeshDimension()) # ! [PySnippetCMeshStdBuild1_3] - mesh=MEDCouplingCMesh.New("My2D_CMesh") + mesh=MEDCouplingCMesh("My2D_CMesh") # ! [PySnippetCMeshStdBuild1_2bis] mesh.setCoordsAt(0,arrX) mesh.setCoordsAt(1,arrY) @@ -2206,6 +2159,8 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertEqual(9*7,mesh.getNumberOfNodes()) self.assertEqual(2,mesh.getSpaceDimension()) self.assertEqual(2,mesh.getMeshDimension()) +# ! [PySnippetCMeshStdBuild1_4] +# ! [PySnippetCMeshStdBuild1_4] return def testExampleUMeshAdvBuild1(self): @@ -2216,15 +2171,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): nodalConnPerCellIndex=[0,5,9,13,18,23] # ! [PySnippetUMeshAdvBuild1_1] # ! [PySnippetUMeshAdvBuild1_2] - mesh=MEDCouplingUMesh.New("My2DMesh",2) + mesh=MEDCouplingUMesh("My2DMesh",2) # ! [PySnippetUMeshAdvBuild1_2] # ! [PySnippetUMeshAdvBuild1_3] - nodalConn=DataArrayInt.New(nodalConnPerCell,23,1) - nodalConnI=DataArrayInt.New(nodalConnPerCellIndex,6,1) + nodalConn=DataArrayInt(nodalConnPerCell,23,1) + nodalConnI=DataArrayInt(nodalConnPerCellIndex,6,1) mesh.setConnectivity(nodalConn,nodalConnI,True) # ! [PySnippetUMeshAdvBuild1_3] # ! [PySnippetUMeshAdvBuild1_4] - coordsArr=DataArrayDouble.New(coords,9,3)#here coordsArr are declared to have 3 components, mesh will deduce that its spaceDim==3. + coordsArr=DataArrayDouble(coords,9,3)#here coordsArr are declared to have 3 components, mesh will deduce that its spaceDim==3. mesh.setCoords(coordsArr)#coordsArr contains 9 tuples, that is to say mesh contains 9 nodes. # ! [PySnippetUMeshAdvBuild1_4] # ! [PySnippetUMeshAdvBuild1_5] @@ -2237,34 +2192,34 @@ class MEDCouplingBasicsTest(unittest.TestCase): dataDouble=[0.,10.,20.,1.,11.,21.,2.,12.,22.,3.,13.,23.,4.,14.,24.] # ! [PySnippetDataArrayBuild1_0] # ! [PySnippetDataArrayBuild1_1] - arrayDouble=DataArrayDouble.New() + arrayDouble=DataArrayDouble() arrayDouble.setValues(dataDouble,5,3)# 5 tuples containing each 3 components # ! [PySnippetDataArrayBuild1_1] # ! [PySnippetDataArrayBuild1_1bis] - arrayDouble=DataArrayDouble.New(dataDouble,5,3) + arrayDouble=DataArrayDouble(dataDouble,5,3) # ! [PySnippetDataArrayBuild1_1bis] # ! [PySnippetDataArrayBuild1_2] dataInt=[0, 10, 20, 1, 11, 21, 2, 12, 22, 3, 13, 23, 4, 14, 24] # ! [PySnippetDataArrayBuild1_2] # ! [PySnippetDataArrayBuild1_3] - arrayInt=DataArrayInt.New() + arrayInt=DataArrayInt() arrayInt.setValues(dataInt,5,3)# 5 tuples containing each 3 components # ! [PySnippetDataArrayBuild1_3] # ! [PySnippetDataArrayBuild1_3bis] - arrayInt=DataArrayInt.New(dataInt,5,3) + arrayInt=DataArrayInt(dataInt,5,3) # ! [PySnippetDataArrayBuild1_3bis] return def testExampleFieldDoubleBuild1(self): - XCoords=[-0.3,0.07,0.1,0.3,0.45,0.47,0.49,1.,1.22] ; arrX=DataArrayDouble.New(XCoords) - YCoords=[0.07,0.1,0.37,0.45,0.47,0.49,1.007] ; arrY=DataArrayDouble.New(YCoords) - mesh=MEDCouplingCMesh.New("My2D_CMesh") + XCoords=[-0.3,0.07,0.1,0.3,0.45,0.47,0.49,1.,1.22]; arrX=DataArrayDouble(XCoords) + YCoords=[0.07,0.1,0.37,0.45,0.47,0.49,1.007]; arrY=DataArrayDouble(YCoords) + mesh=MEDCouplingCMesh("My2D_CMesh") mesh.setCoords(arrX,arrY) # ! [PySnippetFieldDoubleBuild1_1] - fieldOnCells=MEDCouplingFieldDouble.New(ON_CELLS,NO_TIME) + fieldOnCells=MEDCouplingFieldDouble(ON_CELLS,NO_TIME) fieldOnCells.setName("MyTensorFieldOnCellNoTime") fieldOnCells.setMesh(mesh) - array=DataArrayDouble.New() + array=DataArrayDouble() array.alloc(fieldOnCells.getMesh().getNumberOfCells(),9) # Implicitely fieldOnCells will be a 9 components field. array.fillWithValue(7.) fieldOnCells.setArray(array) @@ -2288,15 +2243,15 @@ class MEDCouplingBasicsTest(unittest.TestCase): return def testExampleFieldDoubleBuild2(self): - XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22] ; arrX=DataArrayDouble.New(XCoords) - YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007] ; arrY=DataArrayDouble.New(YCoords) - mesh=MEDCouplingCMesh.New("My2D_CMesh") + XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22]; arrX=DataArrayDouble(XCoords) + YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007]; arrY=DataArrayDouble(YCoords) + mesh=MEDCouplingCMesh("My2D_CMesh") mesh.setCoords(arrX,arrY) # ! [PySnippetFieldDoubleBuild2_1] - fieldOnNodes=MEDCouplingFieldDouble.New(ON_NODES,NO_TIME) + fieldOnNodes=MEDCouplingFieldDouble(ON_NODES,NO_TIME) fieldOnNodes.setName("MyScalarFieldOnNodeNoTime") fieldOnNodes.setMesh(mesh) - array=DataArrayDouble.New() + array=DataArrayDouble() array.alloc(fieldOnNodes.getMesh().getNumberOfNodes(),1) # Implicitely fieldOnNodes will be a 1 component field. array.fillWithValue(7.) fieldOnNodes.setArray(array) @@ -2306,17 +2261,17 @@ class MEDCouplingBasicsTest(unittest.TestCase): return def testExampleFieldDoubleBuild3(self): - XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22] ; arrX=DataArrayDouble.New(XCoords) - YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007] ; arrY=DataArrayDouble.New(YCoords) - mesh=MEDCouplingCMesh.New("My2D_CMesh") + XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22]; arrX=DataArrayDouble(XCoords) + YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007]; arrY=DataArrayDouble(YCoords) + mesh=MEDCouplingCMesh("My2D_CMesh") mesh.setCoords(arrX,arrY) # ! [PySnippetFieldDoubleBuild3_1] - fieldOnCells=MEDCouplingFieldDouble.New(ON_CELLS,ONE_TIME) + fieldOnCells=MEDCouplingFieldDouble(ON_CELLS,ONE_TIME) fieldOnCells.setName("MyTensorFieldOnCellNoTime") fieldOnCells.setTimeUnit("ms") # Time unit is ms. fieldOnCells.setTime(4.22,2,-1) # Time attached is 4.22 ms, iteration id is 2 and order id (or sub iteration id) is -1 fieldOnCells.setMesh(mesh) - array=DataArrayDouble.New() + array=DataArrayDouble() array.alloc(fieldOnCells.getMesh().getNumberOfCells(),2) # Implicitely fieldOnCells will be a 2 components field. array.fillWithValue(7.) fieldOnCells.setArray(array) @@ -2326,18 +2281,18 @@ class MEDCouplingBasicsTest(unittest.TestCase): return def testExampleFieldDoubleBuild4(self): - XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22] ; arrX=DataArrayDouble.New(XCoords) - YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007] ; arrY=DataArrayDouble.New(YCoords) - mesh=MEDCouplingCMesh.New("My2D_CMesh") + XCoords=[-0.3,0.,0.1,0.3,0.45,0.47,0.49,1.,1.22]; arrX=DataArrayDouble(XCoords) + YCoords=[0.,0.1,0.37,0.45,0.47,0.49,1.007]; arrY=DataArrayDouble(YCoords) + mesh=MEDCouplingCMesh("My2D_CMesh") mesh.setCoords(arrX,arrY) # ! [PySnippetFieldDoubleBuild4_1] - fieldOnNodes=MEDCouplingFieldDouble.New(ON_NODES,CONST_ON_TIME_INTERVAL) + fieldOnNodes=MEDCouplingFieldDouble(ON_NODES,CONST_ON_TIME_INTERVAL) fieldOnNodes.setName("MyVecFieldOnNodeWithConstTime") fieldOnNodes.setTimeUnit("ms") # Time unit is ms. fieldOnNodes.setStartTime(4.22,2,-1) fieldOnNodes.setEndTime(6.44,4,-1)# fieldOnNodes is defined in interval [4.22 ms,6.44 ms] fieldOnNodes.setMesh(mesh) - array=DataArrayDouble.New() + array=DataArrayDouble() array.alloc(fieldOnNodes.getMesh().getNumberOfNodes(),3) # Implicitely fieldOnNodes will be a 3 components field. array.fillWithValue(7.) fieldOnNodes.setArray(array) @@ -2348,20 +2303,20 @@ class MEDCouplingBasicsTest(unittest.TestCase): def testExampleDataArrayApplyFunc1(self): # ! [PySnippetDataArrayApplyFunc1_1] - d=DataArrayDouble.New([1.,2.,11.,12.,21.,22.,31.,41.],4,2) + d=DataArrayDouble([1.,2.,11.,12.,21.,22.,31.,41.],4,2) self.assertRaises(InterpKernelException,d.applyFunc,"x*y") # ! [PySnippetDataArrayApplyFunc1_1] # ! [PySnippetDataArrayApplyFunc1_2] - d=DataArrayDouble.New([1.,2.,11.,12.,21.,22.,31.,41.],4,2) + d=DataArrayDouble([1.,2.,11.,12.,21.,22.,31.,41.],4,2) d1=d.applyFunc("smth*smth") self.assertTrue(d1.isEqual(DataArrayDouble([1.,4.,121.,144.,441.,484.,961.,1681.],4,2),1e-12)) # ! [PySnippetDataArrayApplyFunc1_2] # ! [PySnippetDataArrayApplyFunc1_3] - d2=d.applyFunc("smth*IVec+2*smth*JVec") + d2=d.applyFunc(2,"smth1*IVec+2*smth2*JVec") self.assertTrue(d2.isEqual(DataArrayDouble([1.,4.,11.,24.,21.,44.,31.,82.],4,2),1e-12)) # ! [PySnippetDataArrayApplyFunc1_3] # ! [PySnippetDataArrayApplyFunc1_4] - dd=DataArrayDouble.New([1.,4.,3.,11.,144.,13.,21.,484.,23.,31.,1024.,33.],4,3) + dd=DataArrayDouble([1.,4.,3.,11.,144.,13.,21.,484.,23.,31.,1024.,33.],4,3) # ! [PySnippetDataArrayApplyFunc1_4] # ! [PySnippetDataArrayApplyFunc1_5] dd1=dd.applyFunc(1,"f+sqrt(g)+h") @@ -2372,7 +2327,7 @@ class MEDCouplingBasicsTest(unittest.TestCase): self.assertTrue(dd2.isEqual(DataArrayDouble([4.,24.,44.,64.],4,1),1e-12)) # ! [PySnippetDataArrayApplyFunc1_6] # ! [PySnippetDataArrayApplyFunc1_7] - ddd=DataArrayDouble.New([1.,4.,3.,11.,144.,13.,21.,484.,23.,31.,1024.,33.],4,3) + ddd=DataArrayDouble([1.,4.,3.,11.,144.,13.,21.,484.,23.,31.,1024.,33.],4,3) ddd.setInfoOnComponents(["Y [m]","AA [m/s]","GG [MW]"]) # ! [PySnippetDataArrayApplyFunc1_7] # ! [PySnippetDataArrayApplyFunc1_8]