X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling_Swig%2FMEDCouplingBasicsTest3.py;h=51888920ac17fcbdde43defdd66e38335d814bed;hb=1b746b38f3cdeae6654a9501f37fde5e56e59288;hp=30cbabe015f0798dd75c6dd4e58c2d52e8281229;hpb=df138a71c1f646f44f33ff3a2539cd9be1c8e377;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py index 30cbabe01..51888920a 100644 --- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py +++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2024 CEA, EDF # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,13 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from MEDCoupling import * +import sys +from medcoupling import * import unittest from math import pi,e,sqrt,cos,sin from datetime import datetime from MEDCouplingDataForTest import MEDCouplingDataForTest -import rlcompleter,readline # this line has to be here, to ensure a usability of MEDCoupling/MEDLoader. B4 removing it please notify to anthony.geay@cea.fr +import rlcompleter,readline # this line has to be here, to ensure a usability of MEDCoupling/MEDLoader. B4 removing it please notify to anthony.geay@edf.fr class MEDCouplingBasicsTest3(unittest.TestCase): def testSwigGetItem1(self): @@ -130,7 +131,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da.iota(7) da.rearrange(5) da.setInfoOnComponent(0,"X [m]") ; da.setInfoOnComponent(1,"Y [km]") ; da.setInfoOnComponent(2,"Y [m]") - da.setInfoOnComponent(3,"Z [W]") ; da.setInfoOnComponent(4,"ZZ [km]") ; + da.setInfoOnComponent(3,"Z [W]") ; da.setInfoOnComponent(4,"ZZ [km]") ; da[:,2]=3 self.assertEqual([7, 8, 3, 10, 11, 12, 13, 3, 15, 16, 17, 18, 3, 20, 21, 22, 23, 3, 25, 26],da.getValues()) da.rearrange(1) ; da.iota(7) ; da.rearrange(5) @@ -186,7 +187,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da.iota(7) da.rearrange(5) da.setInfoOnComponent(0,"X [m]") ; da.setInfoOnComponent(1,"Y [km]") ; da.setInfoOnComponent(2,"Y [m]") - da.setInfoOnComponent(3,"Z [W]") ; da.setInfoOnComponent(4,"ZZ [km]") ; + da.setInfoOnComponent(3,"Z [W]") ; da.setInfoOnComponent(4,"ZZ [km]") ; da[:,2]=3. self.assertEqual([7., 8., 3., 10., 11., 12., 13., 3., 15., 16., 17., 18., 3., 20., 21., 22., 23., 3., 25., 26.],da.getValues()) da.rearrange(1) ; da.iota(7) ; da.rearrange(5) @@ -271,7 +272,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da-=8 st2=da.getHiddenCppPointer() self.assertEqual(st1,st2) - self.assertEqual(range(12),da.getValues()) + self.assertEqual(list(range(12)), da.getValues()) da+=da1 st2=da.getHiddenCppPointer() self.assertEqual(st1,st2) @@ -347,7 +348,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da-=8 st2=da.getHiddenCppPointer() self.assertEqual(st1,st2) - self.assertEqual(range(12),da.getValues()) + self.assertEqual(list(range(12)), da.getValues()) da+=da1 st2=da.getHiddenCppPointer() self.assertEqual(st1,st2) @@ -484,7 +485,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): pass self.assertEqual([4, 3, 2, 7, 6, 5, 10, 9, 8, 13, 12, 11],li) # __setitem__ testing - da3=da.deepCpy() + da3=da.deepCopy() da2=DataArrayInt.New() da2.alloc(12,1) da2.iota(2002) @@ -492,12 +493,12 @@ class MEDCouplingBasicsTest3(unittest.TestCase): it2=da2.__iter__() i=0 for it in da: - pt=it2.next() + pt = next(it2) it[:]=pt pass self.assertTrue(da.isEqual(da2)) da=da3 - da3=da.deepCpy() + da3=da.deepCopy() # for it in da: it[:]=5 @@ -505,14 +506,14 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da.rearrange(1) self.assertTrue(da.isUniform(5)) da=da3 - da3=da.deepCpy() + da3=da.deepCopy() # for it in da: it[:]=[8,9,12] pass self.assertEqual([8, 9, 12, 8, 9, 12, 8, 9, 12, 8, 9, 12],da.getValues()) da=da3 - da3=da.deepCpy() + da3=da.deepCopy() # for it in da: it[2]=[7] @@ -542,7 +543,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): pass self.assertEqual([4, 3, 2, 7, 6, 5, 10, 9, 8, 13, 12, 11],li) # __setitem__ testing - da3=da.deepCpy() + da3=da.deepCopy() da2=DataArrayDouble.New() da2.alloc(12,1) da2.iota(2002) @@ -550,12 +551,12 @@ class MEDCouplingBasicsTest3(unittest.TestCase): it2=da2.__iter__() i=0 for it in da: - pt=it2.next() + pt = next(it2) it[:]=pt pass self.assertTrue(da.isEqual(da2,1e-12)) da=da3 - da3=da.deepCpy() + da3=da.deepCopy() # for it in da: it[:]=5 @@ -563,14 +564,14 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da.rearrange(1) self.assertTrue(da.isUniform(5,1e-12)) da=da3 - da3=da.deepCpy() + da3=da.deepCopy() # for it in da: it[:]=[8,9,12] pass self.assertEqual([8, 9, 12, 8, 9, 12, 8, 9, 12, 8, 9, 12],da.getValues()) da=da3 - da3=da.deepCpy() + da3=da.deepCopy() # for it in da: it[2]=[7] @@ -616,12 +617,12 @@ class MEDCouplingBasicsTest3(unittest.TestCase): def testDAIAggregateMulti1(self): a=DataArrayInt.New() - a.setValues(range(4),2,2) + a.setValues(list(range(4)), 2, 2) a.setName("aa") b=DataArrayInt.New() - b.setValues(range(6),3,2) + b.setValues(list(range(6)), 3, 2) c=DataArrayInt.Aggregate([a,b]) - self.assertEqual(range(4)+range(6),c.getValues()) + self.assertEqual(list(range(4)) + list(range(6)), c.getValues()) self.assertEqual("aa",c.getName()) self.assertEqual(5,c.getNumberOfTuples()) self.assertEqual(2,c.getNumberOfComponents()) @@ -642,10 +643,10 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertRaises(InterpKernelException,MEDCouplingUMesh.MergeUMeshes,ms+[None]); self.assertRaises(InterpKernelException,MEDCouplingUMesh.MergeUMeshes,ms+[3.4]) m4=MEDCouplingUMesh.MergeUMeshes(ms); - m4.checkCoherency(); + m4.checkConsistencyLight(); self.assertEqual(10,m4.getNumberOfCells()); self.assertEqual(20,m4.getNumberOfNodes()); - self.assertEqual(45,m4.getMeshLength()); + self.assertEqual(45,m4.getNodalConnectivityArrayLen()); m4bis=MEDCouplingMesh.MergeMeshes(ms); self.assertTrue(m4.isEqual(m4bis,1e-12)) del m4bis @@ -675,14 +676,14 @@ class MEDCouplingBasicsTest3(unittest.TestCase): coo.setValues(sourceCoords,4,3); coo.setName("My0D"); m=MEDCouplingUMesh.Build0DMeshFromCoords(coo); - m.checkCoherency(); + m.checkConsistencyLight(); self.assertEqual(4,m.getNumberOfNodes()); self.assertEqual(4,m.getNumberOfCells()); self.assertEqual(3,m.getSpaceDimension()); self.assertEqual(0,m.getMeshDimension()); types1=m.getAllGeoTypes(); self.assertEqual([NORM_POINT1],types1); - for i in xrange(4): + for i in range(4): conn=m.getNodeIdsOfCell(i); self.assertEqual([i],conn); self.assertTrue(NORM_POINT1==m.getTypeOfCell(i)); @@ -695,7 +696,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m=MEDCouplingDataForTest.build2DTargetMesh_1(); m.setDescription(text1); self.assertEqual(m.getDescription(),text1); - m2=m.deepCpy(); + m2=m.deepCopy(); self.assertTrue(m.isEqual(m2,1e-12)); self.assertEqual(m2.getDescription(),text1); m2.setDescription("ggg"); @@ -704,7 +705,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): f=MEDCouplingFieldDouble.New(ON_CELLS,ONE_TIME); f.setTimeUnit(text1); self.assertEqual(f.getTimeUnit(),text1); - f2=f.deepCpy(); + f2=f.deepCopy(); self.assertEqual(f2.getTimeUnit(),text1); # pass @@ -725,7 +726,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(2,len(dms)); self.assertEqual(6,len(das)); self.assertEqual(5,len(das2)); - mfs2=mfs.deepCpy(); + mfs2=mfs.deepCopy(); self.assertTrue(mfs.isEqual(mfs2,1e-12,1e-12)) pass @@ -741,7 +742,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): hs=dt.getHotSpotsTime(); self.assertEqual(6,len(hs)); expected1=[0.2,0.7,1.2,1.35,1.7,2.7] - for i in xrange(6): + for i in range(6): self.assertAlmostEqual(expected1[i],hs[i],12); pass meshId,arrId,arrIdInField,fieldId=dt.getIdsOnTimeRight(0.2); @@ -805,7 +806,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da2=da.checkAndPreparePermutation(); self.assertEqual(8,da2.getNumberOfTuples()); self.assertEqual(1,da2.getNumberOfComponents()); - for i in xrange(8): + for i in range(8): self.assertEqual(expect1[i],da2.getIJ(i,0)); pass # @@ -814,7 +815,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da.iota(0); da2=da.checkAndPreparePermutation(); self.assertEqual(1,da2.getNumberOfComponents()); - self.assertTrue(da2.isIdentity2(8)); + self.assertTrue(da2.isIota(8)); # da=DataArrayInt.New(); da.alloc(8,1); @@ -859,7 +860,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): def testUMeshFindCellIdsOnBoundary1(self): m=MEDCouplingDataForTest.build3DSurfTargetMesh_1(); da5=m.findCellIdsOnBoundary(); - self.assertTrue(da5.isIdentity2(5)); + self.assertTrue(da5.isIota(5)); pass def testMeshSetTime1(self): @@ -890,7 +891,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertTrue(not m1.isEqual(m2,1e-12)); # m1.setTime(10.34,55,12); - m3=m1.deepCpy(); + m3=m1.deepCopy(); self.assertTrue(m1.isEqual(m3,1e-12)); tmp3,tmp1,tmp2=m3.getTime(); self.assertEqual(55,tmp1); @@ -909,7 +910,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(8,tmp1); self.assertEqual(100,tmp2); self.assertAlmostEqual(5.67,tmp3,12); - c=b.deepCpy(); + c=b.deepCopy(); self.assertTrue(c.isEqual(b,1e-12)); tmp3,tmp1,tmp2=c.getTime(); self.assertEqual(8,tmp1); @@ -927,34 +928,34 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da.setValues(vals,5,3); f1.setArray(da); # - self.assertRaises(InterpKernelException,da.applyFunc2,1,"y+z"); + self.assertRaises(InterpKernelException,da.applyFuncCompo,1,"y+z"); da.setInfoOnComponent(0,"x [m]"); da.setInfoOnComponent(1,"y [mm]"); da.setInfoOnComponent(2,"z [km]"); - - self.assertRaises(InterpKernelException, da.applyFunc2, 1, "x+y+zz+zzz"); - self.assertRaises(InterpKernelException, da.applyFunc2, 1, "toto(x+y)"); - self.assertRaises(InterpKernelException, da.applyFunc2, 1, "x/0"); - - da2=da.applyFunc2(1,"y+z"); + + self.assertRaises(InterpKernelException, da.applyFuncCompo, 1, "x+y+zz+zzz"); + self.assertRaises(InterpKernelException, da.applyFuncCompo, 1, "toto(x+y)"); + self.assertRaises(InterpKernelException, da.applyFuncCompo, 1, "x/0"); + + da2=da.applyFuncCompo(1,"y+z"); self.assertEqual(1,da2.getNumberOfComponents()); self.assertEqual(5,da2.getNumberOfTuples()); expected1=[32.,34.,36.,38.,40.] - for i in xrange(5): + for i in range(5): self.assertAlmostEqual(expected1[i],da2.getIJ(0,i),12); pass da2=da.applyFunc(1,"y+z"); expected2=[12.,14.,16.,18.,20.] - for i in xrange(5): + for i in range(5): self.assertAlmostEqual(expected2[i],da2.getIJ(0,i),12); pass # self.assertEqual(3,f1.getNumberOfComponents()); self.assertEqual(5,f1.getNumberOfTuples()); - f1.applyFunc2(1,"y+z"); + f1.applyFuncCompo(1,"y+z"); self.assertEqual(1,f1.getNumberOfComponents()); self.assertEqual(5,f1.getNumberOfTuples()); - for i in xrange(5): + for i in range(5): self.assertAlmostEqual(expected1[i],f1.getArray().getIJ(0,i),12); pass # @@ -972,23 +973,23 @@ class MEDCouplingBasicsTest3(unittest.TestCase): # vs=3*[None]; vs[0]="x"; vs[1]="Y"; vs[2]="z"; - self.assertRaises(InterpKernelException, da.applyFunc3, 1, vs, "y+z"); - self.assertRaises(InterpKernelException, da.applyFunc3, 1, vs, "x+Y+z+zz+zzz"); - self.assertRaises(InterpKernelException, da.applyFunc3, 1, vs, "x/0"); + self.assertRaises(InterpKernelException, da.applyFuncNamedCompo, 1, vs, "y+z"); + self.assertRaises(InterpKernelException, da.applyFuncNamedCompo, 1, vs, "x+Y+z+zz+zzz"); + self.assertRaises(InterpKernelException, da.applyFuncNamedCompo, 1, vs, "x/0"); vs[1]="y"; - da2=da.applyFunc3(1,vs,"y+z"); + da2=da.applyFuncNamedCompo(1,vs,"y+z"); expected1=[32.,34.,36.,38.,40.] - for i in xrange(5): + for i in range(5): self.assertAlmostEqual(expected1[i],da2.getIJ(0,i),12); pass - self.assertRaises(InterpKernelException, da.applyFunc3, 1, ["x","y","z","a"],"x+a") + self.assertRaises(InterpKernelException, da.applyFuncNamedCompo, 1, ["x","y","z","a"],"x+a") f1.setArray(da); self.assertEqual(3,f1.getNumberOfComponents()); self.assertEqual(5,f1.getNumberOfTuples()); - f1.applyFunc3(1,vs,"y+z"); + f1.applyFuncNamedCompo(1,vs,"y+z"); self.assertEqual(1,f1.getNumberOfComponents()); self.assertEqual(5,f1.getNumberOfTuples()); - for i in xrange(5): + for i in range(5): self.assertAlmostEqual(expected1[i],f1.getArray().getIJ(0,i),12); pass pass @@ -996,17 +997,17 @@ class MEDCouplingBasicsTest3(unittest.TestCase): def testFillFromAnalyticTwo1(self): m1=MEDCouplingDataForTest.build3DSurfTargetMesh_1(); m1.setTime(3.4,5,6); m1.setTimeUnit("us"); - self.assertRaises(InterpKernelException,m1.fillFromAnalytic2,ON_NODES,1,"y+z"); + self.assertRaises(InterpKernelException,m1.fillFromAnalyticCompo,ON_NODES,1,"y+z"); m1.getCoords().setInfoOnComponent(0,"x [m]"); m1.getCoords().setInfoOnComponent(1,"y"); m1.getCoords().setInfoOnComponent(2,"z"); - f1=m1.fillFromAnalytic2(ON_NODES,1,"y+z"); + f1=m1.fillFromAnalyticCompo(ON_NODES,1,"y+z"); self.assertAlmostEqual(3.4,f1.getTime()[0],12) ; self.assertEqual(5,f1.getTime()[1]) ; self.assertEqual(6,f1.getTime()[2]) self.assertEqual("us",f1.getTimeUnit()) self.assertEqual(1,f1.getNumberOfComponents()); self.assertEqual(9,f1.getNumberOfTuples()); expected1=[0.2, 0.7, 1.2, 0.7, 1.2, 1.7, 1.2, 1.7, 2.2] - for i in xrange(9): + for i in range(9): self.assertAlmostEqual(expected1[i],f1.getArray().getIJ(0,i),12); pass pass @@ -1016,15 +1017,15 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m1.setTime(3.4,5,6); m1.setTimeUnit("us"); vs=3*[None]; vs[0]="x"; vs[1]="Y"; vs[2]="z"; - self.assertRaises(InterpKernelException,m1.fillFromAnalytic3,ON_NODES,1,vs,"y+z"); + self.assertRaises(InterpKernelException,m1.fillFromAnalyticNamedCompo,ON_NODES,1,vs,"y+z"); vs[1]="y"; - f1=m1.fillFromAnalytic3(ON_NODES,1,vs,"y+z"); + f1=m1.fillFromAnalyticNamedCompo(ON_NODES,1,vs,"y+z"); self.assertAlmostEqual(3.4,f1.getTime()[0],12) ; self.assertEqual(5,f1.getTime()[1]) ; self.assertEqual(6,f1.getTime()[2]) self.assertEqual("us",f1.getTimeUnit()) self.assertEqual(1,f1.getNumberOfComponents()); self.assertEqual(9,f1.getNumberOfTuples()); expected1=[0.2, 0.7, 1.2, 0.7, 1.2, 1.7, 1.2, 1.7, 2.2] - for i in xrange(9): + for i in range(9): self.assertAlmostEqual(expected1[i],f1.getArray().getIJ(0,i),12); pass pass @@ -1108,7 +1109,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(3,resToTest.getNumberOfComponents()); self.assertEqual(2,resToTest.getNumberOfTuples()); expected1=[0.6,0.6,0.6, 0.6,0.6,0.6] - for i in xrange(6): + for i in range(6): self.assertAlmostEqual(expected1[i],resToTest.getIJ(0,i),14); pass # @@ -1148,7 +1149,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): 2.32,1.52,0.0, 1.6,1.32,0.0, 3.52,1.26,0.0,#TRI6 2.6,1.6,0.0, 2.4,1.8,0.0, 2.4,1.2,0.0, 2.3,1.46,0.0,#QUAD4 2.32,2.68,0.0, 2.6,2.42,0.0, 2.8,2.46,0.0, 2.74,2.28,0.0 ];#QUAD8 - for i in xrange(39): + for i in range(39): self.assertAlmostEqual(expected2[i],resToTest.getIJ(0,i),14); pass # @@ -1209,8 +1210,8 @@ class MEDCouplingBasicsTest3(unittest.TestCase): resToTest=f.getLocalizationOfDiscr(); self.assertEqual(3,resToTest.getNumberOfComponents()); self.assertEqual(8,resToTest.getNumberOfTuples());#2+3+4+4 gauss points for resp TRI3,TRI6,QUAD4,QUAD8 - expected3=[1.312,3.15,1.02, 0.56,3.3,0.6, 2.18,1.1,0.2, 1.18,1.54,0.98, 1.56,0.3,3.6, 1.613,0.801,4.374, 2.6,2.4,2.3, 2.31232,2.3933985,1.553255] - for i in xrange(24): + expected3=[1.312,3.15,1.02, 0.56,3.3,0.6, 2.20,1.0,0.2, 2.44, 2.52,1.4, 1.56,0.3,3.6, 1.613,0.801,4.374, 2.6,2.4,2.3, 2.31232,2.3933985,1.553255] + for i in range(24): self.assertAlmostEqual(expected3[i],resToTest.getIJ(0,i),14); pass # @@ -1237,7 +1238,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): loc=[2.27,1.3] locs=f.getValueOnMulti(loc); expected1=[6.0921164547752236, 7.1921164547752232, 8.2921164547752255] - for i in xrange(3): + for i in range(3): self.assertAlmostEqual(expected1[i],locs.getIJ(0,i),12); pass pass @@ -1259,11 +1260,12 @@ class MEDCouplingBasicsTest3(unittest.TestCase): vals1=[1.1,2.1,3.1,4.1,5.2,6.2,7.2,8.2,9.2,10.2] da.setValues(vals1,10,1); f.setArray(da); + f.checkConsistencyLight() # loc=[0.64637931739890486, -0.16185896817550552, 0.22678966365273748] locs=f.getValueOnMulti(loc); expected1=[10.0844021968047] - for i in xrange(1): + for i in range(1): self.assertAlmostEqual(expected1[i],locs.getIJ(0,i),12); pass pass @@ -1278,11 +1280,11 @@ class MEDCouplingBasicsTest3(unittest.TestCase): values1=[7.,107.,10007.,8.,108.,10008.,9.,109.,10009.,10.,110.,10010.,11.,111.,10011.] arr.setValues(values1,nbOfCells,3); loc=[-0.05,-0.05, 0.55,-0.25, 0.55,0.15, -0.05,0.45, 0.45,0.45] - f.checkCoherency(); + f.checkConsistencyLight(); locs=f.getValueOnMulti(loc); self.assertEqual(5,locs.getNumberOfTuples()); self.assertEqual(3,locs.getNumberOfComponents()); - for j in xrange(15): + for j in range(15): self.assertAlmostEqual(values1[j],locs.getIJ(0,j),12); pass # Testing ON_NODES @@ -1295,13 +1297,13 @@ class MEDCouplingBasicsTest3(unittest.TestCase): arr.setValues(values2,nbOfNodes,3); loc2=[0.5432,-0.2432, 0.5478,0.1528, 0.5432,-0.2432, 0.5432,-0.2432] expected2=[9.0272, 109.0272, 10009.0272, 11.4124,111.4124,10011.4124, 9.0272, 109.0272, 10009.0272, 9.0272, 109.0272, 10009.0272] - f.checkCoherency(); + f.checkConsistencyLight(); loc3=DataArrayDouble.New() loc3.setValues(loc2,4,2); locs=f.getValueOnMulti(loc3); self.assertEqual(4,locs.getNumberOfTuples()); self.assertEqual(3,locs.getNumberOfComponents()); - for i in xrange(12): + for i in range(12): self.assertAlmostEqual(expected2[i],locs.getIJ(0,i),12); pass # @@ -1311,23 +1313,23 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d=DataArrayInt.New(); vals1=[2,3,5,6,8,5,5,6,1,-5] d.setValues(vals1,10,1); - d2=d.getIdsNotEqual(5); + d2=d.findIdsNotEqual(5); self.assertEqual(7,d2.getNumberOfTuples()); self.assertEqual(1,d2.getNumberOfComponents()); expected1=[0,1,3,4,7,8,9] - for i in xrange(7): + for i in range(7): self.assertEqual(expected1[i],d2.getIJ(0,i)); pass d.rearrange(2); - self.assertRaises(InterpKernelException,d.getIdsNotEqual,5); + self.assertRaises(InterpKernelException,d.findIdsNotEqual,5); vals2=[-4,5,6] vals3=vals2; d.rearrange(1); - d3=d.getIdsNotEqualList(vals3); + d3=d.findIdsNotEqualList(vals3); self.assertEqual(5,d3.getNumberOfTuples()); self.assertEqual(1,d3.getNumberOfComponents()); expected2=[0,1,4,8,9] - for i in xrange(5): + for i in range(5): self.assertEqual(expected2[i],d3.getIJ(0,i)); pass pass @@ -1340,7 +1342,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d.computeOffsets(); self.assertEqual(6,d.getNumberOfTuples()); self.assertEqual(1,d.getNumberOfComponents()); - for i in xrange(6): + for i in range(6): self.assertEqual(expected1[i],d.getIJ(0,i)); pass pass @@ -1357,16 +1359,16 @@ class MEDCouplingBasicsTest3(unittest.TestCase): mesh.insertNextCell(NORM_HEXGP12,12,conn[0:12]) mesh.finishInsertingCells(); # - mesh.checkCoherency(); + mesh.checkConsistencyLight(); vols=mesh.getMeasureField(False); self.assertEqual(1,vols.getNumberOfTuples()); self.assertEqual(1,vols.getNumberOfComponents()); self.assertAlmostEqual(-5.196152422706632,vols.getIJ(0,0),12); - bary=mesh.getBarycenterAndOwner(); + bary=mesh.computeCellCenterOfMass(); self.assertEqual(1,bary.getNumberOfTuples()); self.assertEqual(3,bary.getNumberOfComponents()); expected1=[0.,0.,1.] - for i in xrange(3): + for i in range(3): self.assertAlmostEqual(expected1[i],bary.getIJ(0,i),12); pass d1=DataArrayInt.New(); @@ -1378,7 +1380,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected4=[[1,2,3,4,5,0],[7,6,11,10,9,8],[1,7,8,2],[2,8,9,3],[3,9,10,4],[4,10,11,5],[5,11,6,0],[0,6,7,1]]; expected2=[NORM_POLYGON, NORM_POLYGON, NORM_QUAD4, NORM_QUAD4, NORM_QUAD4, NORM_QUAD4, NORM_QUAD4, NORM_QUAD4]; expected3=[6,6,4,4,4,4,4,4] - for i in xrange(8): + for i in range(8): self.assertTrue(m2.getTypeOfCell(i)==expected2[i]); v=m2.getNodeIdsOfCell(i); self.assertTrue(len(v)==expected3[i]); @@ -1388,7 +1390,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertTrue(NORM_POLYHED==mesh.getTypeOfCell(0)); mesh.unPolyze(); self.assertTrue(NORM_HEXGP12==mesh.getTypeOfCell(0)); - self.assertEqual(13,mesh.getMeshLength()); + self.assertEqual(13,mesh.getNodalConnectivityArrayLen()); # pass @@ -1409,42 +1411,42 @@ class MEDCouplingBasicsTest3(unittest.TestCase): def testCheckCoherencyDeeper1(self): m=MEDCouplingDataForTest.build3DSourceMesh_1(); - m.checkCoherency(); - m.checkCoherency1(); + m.checkConsistencyLight(); + m.checkConsistency(); m.getNodalConnectivity().setIJ(8,0,-1); - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1); + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency); m.getNodalConnectivity().setIJ(8,0,-6); - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1); + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency); m.getNodalConnectivity().setIJ(8,0,9);#9>=NbOfNodes - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1); + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency); m.getNodalConnectivity().setIJ(8,0,8);#OK - m.checkCoherency(); - m.checkCoherency1(); + m.checkConsistencyLight(); + m.checkConsistency(); elts=[1,5] m.convertToPolyTypes(elts); - m.checkCoherency(); - m.checkCoherency1(); + m.checkConsistencyLight(); + m.checkConsistency(); m.getNodalConnectivity().setIJ(2,0,9);#9>=NbOfNodes - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1); + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency); m.getNodalConnectivity().setIJ(2,0,-3); - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1); + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency); m.getNodalConnectivity().setIJ(2,0,-1); - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1);#Throw because cell#0 is not a polyhedron + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency);#Throw because cell#0 is not a polyhedron m.getNodalConnectivity().setIJ(2,0,4); - m.checkCoherency(); - m.checkCoherency1(); + m.checkConsistencyLight(); + m.checkConsistency(); m.getNodalConnectivity().setIJ(7,0,-1); - m.checkCoherency(); - m.checkCoherency1();#OK because we are in polyhedron connec + m.checkConsistencyLight(); + m.checkConsistency();#OK because we are in polyhedron connec m.getNodalConnectivity().setIJ(36,0,14); - m.checkCoherency(); - self.assertRaises(InterpKernelException,m.checkCoherency1);#Throw beacause now cell 5 is a TETRA4 (14) so mimatch of number index and static type. + m.checkConsistencyLight(); + self.assertRaises(InterpKernelException,m.checkConsistency);#Throw because now cell 5 is a TETRA4 (14) so mismatch of number index and static type. pass def testUnPolyze2(self): @@ -1463,11 +1465,11 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m2.convertToPolyTypes([2]); m2.unPolyze(); self.assertEqual(NORM_TETRA4,m2.getTypeOfCell(2)); - self.assertEqual(40,m2.getMeshLength()); + self.assertEqual(40,m2.getNodalConnectivityArrayLen()); temp2=m2.getNodeIdsOfCell(2); self.assertEqual(temp2,[0,1,2,3]); - m2.checkCoherency1(); - m3=m2.deepCpy(); + m2.checkConsistency(); + m3=m2.deepCopy(); m2.unPolyze(); self.assertTrue(m3.isEqual(m2,1e-12)); pass @@ -1484,25 +1486,25 @@ class MEDCouplingBasicsTest3(unittest.TestCase): # d1=DataArrayDouble.New(); self.assertTrue(not d.isEqual(d1,1e-12)); - d1.cpyFrom(d); + d1.deepCopyFrom(d); self.assertTrue(d.isEqual(d1,1e-12)); - d1.cpyFrom(d); + d1.deepCopyFrom(d); self.assertTrue(d.isEqual(d1,1e-12)); d1.rearrange(2); self.assertTrue(not d.isEqual(d1,1e-12)); - d1.cpyFrom(d); + d1.deepCopyFrom(d); self.assertTrue(d.isEqual(d1,1e-12)); # d2=d.convertToIntArr(); - d4=DataArrayInt.New(); + d4=DataArrayInt32.New(); self.assertTrue(not d2.isEqual(d4)); - d4.cpyFrom(d2); + d4.deepCopyFrom(d2); self.assertTrue(d2.isEqual(d4)); - d4.cpyFrom(d2); + d4.deepCopyFrom(d2); self.assertTrue(d2.isEqual(d4)); d4.rearrange(2); self.assertTrue(not d2.isEqual(d4)); - d4.cpyFrom(d2); + d4.deepCopyFrom(d2); self.assertTrue(d2.isEqual(d4)); pass @@ -1519,7 +1521,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d1.transformWithIndArr(d); self.assertEqual(12,d1.getNumberOfTuples()); self.assertEqual(1,d1.getNumberOfComponents()); - for i in xrange(12): + for i in range(12): self.assertEqual(expected[i],d1.getIJ(i,0)); pass # @@ -1527,7 +1529,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d1.transformWithIndArr(tab1) self.assertEqual(12,d1.getNumberOfTuples()); self.assertEqual(1,d1.getNumberOfComponents()); - for i in xrange(12): + for i in range(12): self.assertEqual(expected[i],d1.getIJ(i,0)); pass pass @@ -1540,7 +1542,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da2=da.buildPermArrPerLevel(); self.assertEqual(12,da2.getNumberOfTuples()); self.assertEqual(1,da2.getNumberOfComponents()); - for i in xrange(12): + for i in range(12): self.assertEqual(expected1[i],da2.getIJ(i,0)); pass pass @@ -1558,17 +1560,17 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(4,da2.getNumberOfTuples()); self.assertEqual(3,da2.getNumberOfComponents()); expected1=[1,1,8,12,9,9,14,15,14,14,12,14] - for i in xrange(12): + for i in range(12): self.assertEqual(expected1[i],da2.getIJ(0,i)); pass da1.substractEqual(da); expected2=[3,5,0,-2,3,5,2,3,6,8,12,12] - for i in xrange(12): + for i in range(12): self.assertEqual(expected2[i],da1.getIJ(0,i)); pass da1.rearrange(1); da1.iota(2); da1.rearrange(3); da1.addEqual(da); - for i in xrange(12): + for i in range(12): self.assertEqual(expected1[i],da1.getIJ(0,i)); pass da1.rearrange(1); da1.iota(2); da1.rearrange(3); @@ -1576,53 +1578,53 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(4,da2.getNumberOfTuples()); self.assertEqual(3,da2.getNumberOfComponents()); expected3=[-2,-6,16,35,18,14,48,54,40,33,0,13] - for i in xrange(12): + for i in range(12): self.assertEqual(expected3[i],da2.getIJ(0,i)); pass da.divideEqual(da1); self.assertEqual(4,da.getNumberOfTuples()); self.assertEqual(3,da.getNumberOfComponents()); expected4=[0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0] - for i in xrange(12): + for i in range(12): self.assertEqual(expected4[i],da.getIJ(0,i)); pass da.setValues(arr1,4,3); da1.multiplyEqual(da); self.assertEqual(4,da1.getNumberOfTuples()); self.assertEqual(3,da1.getNumberOfComponents()); - for i in xrange(12): + for i in range(12): self.assertEqual(expected3[i],da1.getIJ(0,i)); pass da1.rearrange(1); da1.iota(2); da1.rearrange(3); da2=DataArrayInt.Divide(da,da1); self.assertEqual(4,da2.getNumberOfTuples()); self.assertEqual(3,da2.getNumberOfComponents()); - for i in xrange(12): + for i in range(12): self.assertEqual(expected4[i],da2.getIJ(0,i)); pass da1.applyInv(321); self.assertEqual(4,da1.getNumberOfTuples()); self.assertEqual(3,da1.getNumberOfComponents()); expected5=[160,107,80,64,53,45,40,35,32,29,26,24] - for i in xrange(12): + for i in range(12): self.assertEqual(expected5[i],da1.getIJ(0,i)); pass da1.applyDivideBy(2); self.assertEqual(4,da1.getNumberOfTuples()); self.assertEqual(3,da1.getNumberOfComponents()); expected6=[80,53,40,32,26,22,20,17,16,14,13,12] - for i in xrange(12): + for i in range(12): self.assertEqual(expected6[i],da1.getIJ(0,i)); pass expected7=[3,4,5,4,5,1,6,3,2,0,6,5] da1.applyModulus(7); - for i in xrange(12): + for i in range(12): self.assertEqual(expected7[i],da1.getIJ(0,i)); pass da1.applyLin(1,1); expected8=[3,3,3,3,3,1,3,3,0,0,3,3] da1.applyRModulus(3); - for i in xrange(12): + for i in range(12): self.assertEqual(expected8[i],da1.getIJ(0,i)); pass pass @@ -1634,37 +1636,37 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected1=[1,32,29,23,41,36] self.assertEqual(47,da0.getNumberOfTuples()); self.assertEqual(1,da0.getNumberOfComponents()); - for i in xrange(47): + for i in range(47): self.assertEqual(expected0[i],da0.getIJ(0,i)); pass self.assertEqual(6,da5.getNumberOfTuples()); self.assertEqual(1,da5.getNumberOfComponents()); - for i in xrange(6): + for i in range(6): self.assertEqual(expected1[i],da5.getIJ(0,i)); pass expected2=[0,1,2,3,4,0,5,6,7,4,8,9,1,7,10,11,12,13,14,5,15,16,17,8,18,19,20,10,21,22,23,2,13,24,25,21,16,26,27,12,19,28,29,15,22,30,31,18,36,26,28,30,24,37,32,33,34,35,38,36,39,40,41,42,37,38,43,44,45,46] self.assertEqual(70,da1.getNumberOfTuples()); self.assertEqual(1,da1.getNumberOfComponents()); - for i in xrange(70): + for i in range(70): self.assertEqual(expected2[i],da1.getIJ(0,i)); pass expected3=[0,4,8,12,16,20,24,28,32,36,40,44,48,53,58,64,70] self.assertEqual(17,da2.getNumberOfTuples()); self.assertEqual(1,da2.getNumberOfComponents()); - for i in xrange(17): + for i in range(17): self.assertEqual(expected3[i],da2.getIJ(0,i)); pass expected4=[0,2,4,6,7,9,11,12,14,16,17,19,20,22,24,25,27,29,30,32,34,35,37,39,40,42,43,45,46,48,49,51,52,53,54,55,56,58,60,62,63,64,65,66,67,68,69,70] #expected4=[0,2,4,6,7,9,11,12,14,16,17,19,20,22,24,25,27,29,30,32,34,35,37,39,40,42,43,45,46,48,49,51,52,54,56,57,58,59,60,62,63,64,65,66,67,68,69,70]; self.assertEqual(48,da4.getNumberOfTuples()); self.assertEqual(1,da4.getNumberOfComponents()); - for i in xrange(48): + for i in range(48): self.assertEqual(expected4[i],da4.getIJ(0,i)); pass expected5=[0,1,0,3,0,7,0,1,2,1,4,1,2,3,2,5,2,3,6,3,4,9,4,8,4,5,10,5,9,5,6,11,6,10,6,7,8,7,11,7,8,12,8,9,12,9,10,12,10,11,12,11,13,13,13,13,12,14,13,15,14,15,14,14,14,14,15,15,15,15] self.assertEqual(70,da3.getNumberOfTuples()); self.assertEqual(1,da3.getNumberOfComponents()); - for i in xrange(70): + for i in range(70): self.assertEqual(expected5[i],da3.getIJ(0,i)); pass pass @@ -1678,7 +1680,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected1=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,36,37,32,33,34,35,38,39,40,41,42,43,44,45,46] self.assertEqual(47,da0.getNumberOfTuples()); self.assertEqual(1,da0.getNumberOfComponents()); - for i in xrange(47): + for i in range(47): self.assertEqual(expected0[i],da0.getIJ(0,i)); pass self.assertEqual(2,da1.getNumberOfTuples()); @@ -1690,14 +1692,14 @@ class MEDCouplingBasicsTest3(unittest.TestCase): # self.assertEqual(47,da2.getNumberOfTuples()); self.assertEqual(1,da2.getNumberOfComponents()); - for i in xrange(47): + for i in range(47): self.assertEqual(expected1[i],da2.getIJ(0,i)); pass pass def testSortCellsInMEDFileFrmt1(self): m,m1=MEDCouplingDataForTest.buildPointe_1(); - m2=m.deepCpy() + m2=m.deepCopy() da=DataArrayInt.New() da.setValues([0,1,2,14,3,12,4,5,15,6,7,8,9,10,11,13],16,1) daa=da.invertArrayN2O2O2N(16) @@ -1741,7 +1743,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d3=d.transformWithIndArrR(d1); self.assertEqual(6,d3.getNumberOfTuples()); self.assertEqual(1,d3.getNumberOfComponents()); - for i in xrange(6): + for i in range(6): self.assertEqual(expected[i],d3.getIJ(i,0)); pass # @@ -1749,7 +1751,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d3=d.transformWithIndArrR(tab2) self.assertEqual(6,d3.getNumberOfTuples()); self.assertEqual(1,d3.getNumberOfComponents()); - for i in xrange(6): + for i in range(6): self.assertEqual(expected[i],d3.getIJ(i,0)); pass pass @@ -1769,7 +1771,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): # expected1=[1,1,0,0,0,1,1,0,1] expected2=[2,1,0,3,2,3,4,1,0] - for i in xrange(9): + for i in range(9): self.assertEqual(expected1[i],e.getIJ(i,0)); self.assertEqual(expected2[i],f.getIJ(i,0)); pass @@ -1778,6 +1780,12 @@ class MEDCouplingBasicsTest3(unittest.TestCase): # d.setIJ(6,0,9); self.assertRaises(InterpKernelException,d.splitByValueRange,val2); + # non regression test in python wrapping + rg=DataArrayInt([0,10,29,56,75,102,121,148,167,194,213,240,259,286,305,332,351,378,397,424,443,470,489,516]) + a,b,c=DataArrayInt([75]).splitByValueRange(rg) + assert(a.isEqual(DataArrayInt([4]))) + assert(b.isEqual(DataArrayInt([0]))) + assert(c.isEqual(DataArrayInt([4]))) pass def testUMeshSplitProfilePerType1(self): @@ -1882,7 +1890,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(11,f.getNumberOfTuples()); self.assertEqual(1,f.getNumberOfComponents()); expected1=[0,1,2,6,7,8,9,10,11,12,13] - for i in xrange(11): + for i in range(11): self.assertEqual(expected1[i],f.getIJ(i,0)); pass pass @@ -1892,10 +1900,10 @@ class MEDCouplingBasicsTest3(unittest.TestCase): vals1=[3,5,1,2,0,8] expected1=[0,3,8,9,11,11,19] d.setValues(vals1,6,1); - d.computeOffsets2(); + d.computeOffsetsFull(); self.assertEqual(7,d.getNumberOfTuples()); self.assertEqual(1,d.getNumberOfComponents()); - for i in xrange(7): + for i in range(7): self.assertEqual(expected1[i],d.getIJ(0,i)); pass pass @@ -1920,7 +1928,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertTrue(f1.isEqual(f2,1e-12,1e-12)); # pass - + def testGetDistributionOfTypes1(self): m=MEDCouplingDataForTest.build2DTargetMesh_1(); tab1=[2,0,1,3,4] @@ -1945,7 +1953,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): tab=[1.2,1.3,2.2,2.3,3.2,3.3,4.2,4.3,5.2,5.3] d.setValues(tab,5,2); f.setArray(d); - f.checkCoherency(); + f.checkConsistencyLight(); # self.assertAlmostEqual(11.209371079592289,f.norm2(),14); # @@ -1956,14 +1964,28 @@ class MEDCouplingBasicsTest3(unittest.TestCase): f=MEDCouplingFieldDouble.New(ON_CELLS,ONE_TIME); f.setMesh(m); # - d=DataArrayDouble.New(); + d=DataArrayDouble.New(); d.alloc(0,2) + res = d.normMaxPerComponent() + self.assertAlmostEqual(-1.0, res[0],14) + self.assertAlmostEqual(-1.0, res[1],14) + tab=[2.3,-1.2,6.3,-7.8,2.9,7.7,2.1,0.,3.6,-7.6] d.setValues(tab,5,2); + + res = d.normMaxPerComponent() + self.assertAlmostEqual(6.3, res[0],14) + self.assertAlmostEqual(7.8, res[1],14) + f.setArray(d); - f.checkCoherency(); + f.checkConsistencyLight(); # - self.assertAlmostEqual(7.8,f.normMax(),14); + res = f.normMax() + self.assertAlmostEqual(6.3,res[0],14); + self.assertAlmostEqual(7.8,res[1],14); # + self.assertAlmostEqual(6.3,f.normMax(0),14); + self.assertAlmostEqual(7.8,f.normMax(1),14); + pass def testFindAndCorrectBadOriented3DExtrudedCells1(self): @@ -2023,14 +2045,14 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected2=[0,5,14,19,42,49,86,95,108,159] self.assertEqual(expected1,da.getValues()); self.assertEqual(expected2,dai.getValues()); - m.checkCoherency2() + m.checkConsistency() pass def testNonRegressionCopyTinyStrings(self): m=MEDCouplingDataForTest.build2DTargetMesh_1() f1=m.getMeasureField(True) f1.getArray().setInfoOnComponent(0,"P [N/m^2]") - bary=m.getBarycenterAndOwner() + bary=m.computeCellCenterOfMass() f2=f1.buildNewTimeReprFromThis(NO_TIME,False) f2.setArray(bary) self.assertRaises(InterpKernelException,f1.copyTinyAttrFrom,f2) @@ -2070,7 +2092,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m3.setName(m.getName()); self.assertTrue(m.isEqual(m3,1e-12)); pass - + def testChangeUnderlyingMeshWithCMesh1(self): mesh=MEDCouplingCMesh.New(); coordsX=DataArrayDouble.New(); @@ -2084,7 +2106,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): coordsZ.setValues(arrZ,4,1); mesh.setCoords(coordsX,coordsY,coordsZ); f=mesh.getMeasureField(True) - mesh2=mesh.deepCpy() + mesh2=mesh.deepCopy() for myId in [0,1,2,10,11,12,20,21,22]: f=mesh.getMeasureField(True) f.changeUnderlyingMesh(mesh2,myId,1e-12); @@ -2148,7 +2170,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(0,c.getNbOfElems()); self.assertEqual(1,cI.getNbOfElems()); self.assertEqual([0],cI.getValues()) - + array12=[0.]*(6*5) da.setValues(array12,6,5) #bad NumberOfComponents self.assertRaises(InterpKernelException, da.findCommonTuples, 1e-2); @@ -2182,14 +2204,14 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected1=[2.301,1.2,1.3,0.8] dv=da.getDifferentValues(1e-2); self.assertEqual(4,dv.getNbOfElems()); - for i in xrange(4): + for i in range(4): self.assertAlmostEqual(expected1[i],dv.getIJ(i,0),14); pass # dv=da.getDifferentValues(2e-1); expected2=[2.301,1.3,0.8] self.assertEqual(3,dv.getNbOfElems()); - for i in xrange(3): + for i in range(3): self.assertAlmostEqual(expected2[i],dv.getIJ(i,0),14); pass pass @@ -2201,13 +2223,13 @@ class MEDCouplingBasicsTest3(unittest.TestCase): a.setValues(arr,5,1); b=DataArrayInt.New(); b.setValues(arrI,3,1); - ret,newNbTuple=DataArrayInt.BuildOld2NewArrayFromSurjectiveFormat2(10,a,b); + ret,newNbTuple=DataArrayInt.ConvertIndexArrayToO2N(10,a,b); expected=[0,1,2,0,3,4,5,4,6,4] self.assertEqual(10,ret.getNbOfElems()); self.assertEqual(7,newNbTuple); self.assertEqual(1,ret.getNumberOfComponents()); self.assertEqual(expected,ret.getValues()); - self.assertRaises(InterpKernelException,DataArrayInt.BuildOld2NewArrayFromSurjectiveFormat2,9,a,b); + self.assertRaises(InterpKernelException,DataArrayInt.ConvertIndexArrayToO2N,9,a,b); pass def testDADIReverse1(self): @@ -2216,12 +2238,12 @@ class MEDCouplingBasicsTest3(unittest.TestCase): a.setValues(arr,6,1); self.assertEqual(2,a.back()); a.reverse(); - for i in xrange(6): + for i in range(6): self.assertEqual(arr[5-i],a.getIJ(i,0)); pass a.setValues(arr[:-1],5,1); a.reverse(); - for i in xrange(5): + for i in range(5): self.assertEqual(arr[4-i],a.getIJ(i,0)); pass # @@ -2229,13 +2251,13 @@ class MEDCouplingBasicsTest3(unittest.TestCase): b=DataArrayDouble.New(); b.setValues(arr2,6,1); b.reverse(); - for i in xrange(6): + for i in range(6): self.assertAlmostEqual(arr2[5-i],b.getIJ(i,0),14); pass b.setValues(arr2[:5],5,1); self.assertAlmostEqual(9.,b.back(),14) b.reverse(); - for i in xrange(5): + for i in range(5): self.assertAlmostEqual(arr2[4-i],b.getIJ(i,0),14); pass pass @@ -2259,7 +2281,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): mesh=MEDCouplingDataForTest.build2DTargetMesh_1(); # mesh2,desc,descIndx,revDesc,revDescIndx=mesh.buildDescendingConnectivity2(); - mesh2.checkCoherency(); + mesh2.checkConsistencyLight(); self.assertEqual(1,mesh2.getMeshDimension()); self.assertEqual(13,mesh2.getNumberOfCells()); self.assertEqual(14,revDescIndx.getNbOfElems()); self.assertEqual(14,revDescIndx.getNumberOfTuples()); @@ -2294,7 +2316,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m1c.setCoordsAt(1,coordsY); m1=m1c.buildUnstructured() m1bis=m1.buildPartOfMySelf([3,4,5],False) - m2=m1.deepCpy() + m2=m1.deepCopy() m2=m2.buildPartOfMySelf([0,1,2],False) m2.translate([0.5,0.5]) # @@ -2315,7 +2337,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(9,m3.getNodalConnectivityIndex().getNumberOfTuples()); self.assertEqual(expected3,m3.getNodalConnectivity().getValues()); self.assertEqual(expected4,m3.getNodalConnectivityIndex().getValues()); - for i in xrange(44): + for i in range(44): self.assertAlmostEqual(expected5[i],m3.getCoords().getIJ(0,i),12); pass pass @@ -2380,11 +2402,11 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(10,m3.getNodalConnectivityIndex().getNumberOfTuples()); self.assertEqual(expected3,m3.getNodalConnectivity().getValues()); self.assertEqual(expected4,m3.getNodalConnectivityIndex().getValues()); - for i in xrange(44): + for i in range(44): self.assertAlmostEqual(expected5[i],m3.getCoords().getIJ(0,i),12); pass pass - + def testBuildPartOfMySelfSafe1(self): mesh=MEDCouplingDataForTest.build2DTargetMesh_1() self.assertRaises(InterpKernelException,mesh.buildPartOfMySelf,[0,-1,4,2],True) @@ -2415,7 +2437,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m2=MEDCouplingUMesh.New(); m2.setMeshDimension(2); m2.allocateCells(8); - for i in xrange(8): + for i in range(8): m2.insertNextCell(NORM_QUAD4,4,m2Conn[4*i:4*(i+1)]) pass m2.finishInsertingCells(); @@ -2442,7 +2464,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(17,m3.getNodalConnectivityIndex().getNumberOfTuples()); self.assertEqual(expected3,m3.getNodalConnectivity().getValues()); self.assertEqual(expected4,m3.getNodalConnectivityIndex().getValues()); - for i in xrange(208): + for i in range(208): self.assertAlmostEqual(expected5[i],m3.getCoords().getIJ(0,i),12); pass pass @@ -2466,7 +2488,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): myCoords1.setValues(m1Coords,25,2); m1.setCoords(myCoords1); # - m11=m1.deepCpy(); + m11=m1.deepCopy(); m11.tessellate2D(1.); self.assertTrue(m11.getCoords().isEqual(m11.getCoords(),1e-12)); expected1=[5,0,3,11,1,5,3,4,12,2,1,11,5,5,15,3,0,5,6,16,4,3,15,5,5,5,0,7,19,5,6,5,19,7,8,20,5,0,1,23,7,5,1,2,24,8,7,23] @@ -2476,13 +2498,13 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(expected1,m11.getNodalConnectivity().getValues()); self.assertEqual(expected2,m11.getNodalConnectivityIndex().getValues()); # - m12=m1.deepCpy(); + m12=m1.deepCopy(); m12.tessellate2D(0.5); self.assertEqual(41,m12.getNumberOfNodes()); expected3=[5,0,3,25,26,1,5,3,4,27,28,2,1,26,25,5,5,29,30,3,0,5,6,31,32,4,3,30,29,5,5,5,0,7,33,34,5,6,5,34,33,7,8,35,36,5,0,1,37,38,7,5,1,2,39,40,8,7,38,37] expected4=[0,6,15,21,30,36,45,51,60] expected5=[0.,0.,1.,0.,1.5,0.,0.,1.,0.,1.5,-1.,0.,-1.5,0.,0.,-1.,0.,-1.5,0.5,0.,1.25,0.,0.7071067811865476,0.7071067811865476,1.0606601717798214,1.0606601717798214,0.,0.5,0.,1.25,-0.7071067811865476,0.7071067811865476,-1.0606601717798214,1.0606601717798214,-0.5,0.,-1.25,0.,-0.7071067811865476,-0.7071067811865476,-1.0606601717798214,-1.0606601717798214,0.,-0.5,0.,-1.25,0.7071067811865476,-0.7071067811865476,1.0606601717798214,-1.0606601717798214,0.479425538604203,0.8775825618903728,0.8414709848078964,0.54030230586814,0.7191383079063044,1.3163738428355591,1.2622064772118446,0.8104534588022099,-0.877582561890373,0.4794255386042027,-0.5403023058681399,0.8414709848078964,-1.3163738428355596,0.7191383079063038,-0.8104534588022098,1.2622064772118446,-0.4794255386042031,-0.8775825618903728,-0.8414709848078965,-0.5403023058681399,-0.7191383079063045,-1.3163738428355591,-1.2622064772118449,-0.8104534588022098,0.8775825618903729,-0.47942553860420295,0.54030230586814,-0.8414709848078964,1.3163738428355594,-0.7191383079063043,0.8104534588022099,-1.2622064772118446] - for i in xrange(82): + for i in range(82): self.assertAlmostEqual(expected5[i],m12.getCoords().getIJ(0,i),12); pass self.assertEqual(60,m12.getNodalConnectivity().getNumberOfTuples()); @@ -2503,67 +2525,11 @@ class MEDCouplingBasicsTest3(unittest.TestCase): myCoords = DataArrayDouble.New(mcoords, 3, 2) m1.setCoords(myCoords) - - m2 = m1.deepCpy() - m2.tessellate2DCurve(0.1) - # If the following raises, the test will fail automatically: - m2.checkCoherency1(0.0) # eps param not used - def testIntersect2DMeshesTmp4(self): - m1Coords=[0.,0.,1.,0.,1.5,0.,0.,1.,0.,1.5,-1.,0.,-1.5,0.,0.,-1,0.,-1.5,0.5,0.,1.25,0.,0.70710678118654757,0.70710678118654757,1.0606601717798214,1.0606601717798214,0.,0.5,0.,1.25,-0.70710678118654757,0.70710678118654757,-1.0606601717798214,1.0606601717798214,-0.5,0.,-1.25,0.,-0.70710678118654757,-0.70710678118654757,-1.0606601717798214,-1.0606601717798214,0.,-0.5,0.,-1.25,0.70710678118654757,-0.70710678118654757,1.0606601717798214,-1.0606601717798214]; - m1Conn=[0,3,1,13,11,9, 3,4,2,1,14,12,10,11, 5,3,0,15,13,17, 6,4,3,5,16,14,15,18, 5,0,7,17,21,19, 6,5,7,8,18,19,22,20, 0,1,7,9,23,21, 1,2,8,7,10,24,22,23]; - m1=MEDCouplingUMesh.New(); - m1.setMeshDimension(2); - m1.allocateCells(8); - m1.insertNextCell(NORM_TRI6,6,m1Conn[0:6]); - m1.insertNextCell(NORM_QUAD8,8,m1Conn[6:14]); - m1.insertNextCell(NORM_TRI6,6,m1Conn[14:20]); - m1.insertNextCell(NORM_QUAD8,8,m1Conn[20:28]); - m1.insertNextCell(NORM_TRI6,6,m1Conn[28:34]); - m1.insertNextCell(NORM_QUAD8,8,m1Conn[34:42]); - m1.insertNextCell(NORM_TRI6,6,m1Conn[42:48]); - m1.insertNextCell(NORM_QUAD8,8,m1Conn[48:56]); - m1.finishInsertingCells(); - myCoords1=DataArrayDouble.New(); - myCoords1.setValues(m1Coords,25,2); - m1.setCoords(myCoords1); - # - m2Coords=[0.,0.,1.1,0.,1.1,1.,0.,1.,1.7,0.,1.7,1.,-1.1,1.,-1.1,0.,-1.7,0.,-1.7,1.,-1.7,-1,-1.1,-1.,0.,-1.,1.1,-1,1.7,-1.] - m2Conn=[0,3,2,1, 1,2,5,4, 7,6,3,0, 8,9,6,7, 7,0,12,11, 8,7,11,10, 0,1,13,12, 1,4,14,13] - m2=MEDCouplingUMesh.New(); - m2.setMeshDimension(2); - m2.allocateCells(8); - for i in xrange(8): - m2.insertNextCell(NORM_QUAD4,4,m2Conn[4*i:4*(i+1)]) - pass - m2.finishInsertingCells(); - myCoords2=DataArrayDouble.New(); - myCoords2.setValues(m2Coords,15,2); - m2.setCoords(myCoords2); - # - m3,d1,d2=MEDCouplingUMesh.Intersect2DMeshes(m2,m1,1e-10) - m3.unPolyze() - # - expected1=[0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7] - expected2=[0,1,1,-1,2,3,3,-1,4,5,5,-1,6,7,7,-1] - self.assertEqual(16,d1.getNumberOfTuples()); - self.assertEqual(16,d2.getNumberOfTuples()); - self.assertEqual(16,m3.getNumberOfCells()); - self.assertEqual(104,m3.getNumberOfNodes()); - self.assertEqual(2,m3.getSpaceDimension()); - self.assertEqual(expected1,d1.getValues()); - self.assertEqual(expected2,d2.getValues()); - expected3=[6,16,15,18,44,45,46,8,18,2,1,16,47,48,49,50,8,17,1,2,40,51,52,53,54,8,40,5,4,17,55,56,57,58,6,18,15,20,59,60,61,8,20,7,6,18,62,63,64,65,8,41,6,7,21,66,67,68,69,8,21,8,9,41,70,71,72,73,6,20,15,22,74,75,76,8,22,11,7,20,77,78,79,80,8,21,7,11,42,81,82,83,84,8,42,10,8,21,85,86,87,88,6,22,15,16,89,90,91,8,16,1,13,22,92,93,94,95,8,43,13,1,17,96,97,98,99,8,17,4,14,43,100,101,102,103] - expected4=[0,7,16,25,34,41,50,59,68,75,84,93,102,109,118,127,136] - expected5=[0.,0.,1.1, 0.,1.1,1.,0.,1.,1.7,0.,1.7,1.,-1.1,1.,-1.1,0.,-1.7,0.,-1.7,1.,-1.7,-1.,-1.1,-1.,0.,-1.,1.1,-1.,1.7,-1.,0.,0.,1.,0.,1.5,0.,0.,1.,0.,1.5,-1.,0.,-1.5,0.,0.,-1.,0.,-1.5,0.5,0.,1.25,0.,0.7071067811865476,0.7071067811865476,1.0606601717798214,1.0606601717798214,0.,0.5,0.,1.25,-0.7071067811865476,0.7071067811865476,-1.0606601717798214,1.0606601717798214,-0.5,0.,-1.25,0.,-0.7071067811865476,-0.7071067811865476,-1.0606601717798214,-1.0606601717798214,0.,-0.5,0.,-1.25,0.7071067811865476,-0.7071067811865476,1.0606601717798214,-1.0606601717798214,1.1180339887498951,1.,-1.1180339887498951,1.,-1.1180339887498951,-1.,1.1180339887498951,-1.,0.5,0.,0.,0.5,0.7071067811865477,0.7071067811865476,0.55,1.,1.1,0.5,1.05,0.,0.7071067811865477,0.7071067811865475,1.3,0.,1.1,0.5,1.1090169943749475,1.,1.4012585384440737,0.535233134659635,1.4090169943749475,1.,1.7,0.5,1.6,0.,1.4012585384440737,0.535233134659635,0.,0.5,-0.5,0.,-0.7071067811865477,0.7071067811865476,-1.05,0.,-1.1,0.5,-0.55,1.,-0.7071067811865478,0.7071067811865475,-1.1090169943749475,1.,-1.1,0.5,-1.3,0.,-1.4012585384440737,0.5352331346596344,-1.6,0.,-1.7,0.5,-1.4090169943749475,1.,-1.4012585384440737,0.5352331346596344,-0.5,0.,0.,-0.5,-0.7071067811865475,-0.7071067811865477,-0.55,-1.,-1.1,-0.5,-1.05,0.,-0.7071067811865475,-0.7071067811865477,-1.3,0.,-1.1,-0.5,-1.1090169943749475,-1.,-1.4012585384440734,-0.5352331346596354,-1.4090169943749475,-1.,-1.7,-0.5,-1.6,0.,-1.4012585384440732,-0.5352331346596354,0.,-0.5,0.5,0.,0.7071067811865475,-0.7071067811865477,1.05,0.,1.1,-0.5,0.55,-1.,0.7071067811865475,-0.7071067811865477,1.1090169943749475,-1.,1.1,-0.5,1.3,0.,1.4012585384440737,-0.535233134659635,1.6,0.,1.7,-0.5,1.4090169943749475,-1.,1.4012585384440737,-0.535233134659635] - self.assertEqual(136,m3.getNodalConnectivity().getNumberOfTuples()); - self.assertEqual(17,m3.getNodalConnectivityIndex().getNumberOfTuples()); - self.assertEqual(expected3,m3.getNodalConnectivity().getValues()); - self.assertEqual(expected4,m3.getNodalConnectivityIndex().getValues()); - for i in xrange(208): - self.assertAlmostEqual(expected5[i],m3.getCoords().getIJ(0,i),12); - pass - pass + m2 = m1.deepCopy() + m2.tessellate2D(0.1) + # If the following raises, the test will fail automatically: + m2.checkConsistency(0.0) # eps param not used def testGetCellIdsCrossingPlane1(self): mesh3D,mesh2D=MEDCouplingDataForTest.build3DExtrudedUMesh_1(); @@ -2595,7 +2561,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(expected1,ids.getValues()); self.assertEqual(expected2,slice1.getNodalConnectivity().getValues()); self.assertEqual(expected3,slice1.getNodalConnectivityIndex().getValues()); - for i in xrange(171): + for i in range(171): self.assertAlmostEqual(expected4[i],slice1.getCoords().getIJ(0,i),12); pass # 2nd slice based on already existing nodes of mesh3D. @@ -2615,7 +2581,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(expected1,ids.getValues()); self.assertEqual(expected5,slice1.getNodalConnectivity().getValues()); self.assertEqual(expected6,slice1.getNodalConnectivityIndex().getValues()); - for i in xrange(180): + for i in range(180): self.assertAlmostEqual(expected7[i],slice1.getCoords().getIJ(0,i),12); pass # 3rd slice based on shared face of mesh3D. @@ -2636,11 +2602,42 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(expected8,ids.getValues()); self.assertEqual(expected9,slice1.getNodalConnectivity().getValues()); self.assertEqual(expected10,slice1.getNodalConnectivityIndex().getValues()); - for i in xrange(135): + for i in range(135): self.assertAlmostEqual(expected11[i],slice1.getCoords().getIJ(0,i),12); pass + ## + coo = DataArrayDouble([1.8686305176182501,0.85678785370447097,7.4, 1.8686305176182501,0.85678785370447097,7.5, 1.8663408654534299,0.82910039403216995,7.4, 1.8663408654534299,0.82910039403216995,7.5, 1.8370211426271501,0.83286926189135702,7.4, 1.8370211426271501,0.83286926189135702,7.5, 1.84595839792064,0.86012397150595199,7.4, 1.84595839792064,0.86012397150595199,7.5], 8,3) + conn = DataArrayInt([18,0,2,4,6,1,3,5,7]) + connI = DataArrayInt([0,9]) + + mesh3D_2=MEDCouplingUMesh.New(); + mesh3D_2.setName("3DMesh_2"); + mesh3D_2.setMeshDimension(3); + mesh3D_2.setCoords(coo); + mesh3D_2.setConnectivity(conn,connI,True); + + expected12=[0] + expected13=[5,5,9,8,4] + expected14=[0,5] + expected15=[1.8686305176182501,0.85678785370447097,7.4, 1.8686305176182501,0.85678785370447097,7.5, 1.8663408654534299,0.82910039403216995,7.4, 1.8663408654534299,0.82910039403216995,7.5, 1.8370211426271501,0.83286926189135702,7.4, 1.8370211426271501,0.83286926189135702,7.5, 1.84595839792064,0.86012397150595199, 7.4, 1.84595839792064,0.86012397150595199,7.5, 1.8666525378798646,0.83286927118760312,7.4, 1.8666525378798646,0.83286927118760312,7.5] + + y_cut = 0.8328692711876031 + ori, vec = [0.0, y_cut, 0.0], [0.0,1.0,0.0] + slice1, ids = mesh3D_2.buildSlice3D(DataArrayDouble(ori,1,3), DataArrayDouble(vec,1,3), 1.0e-8) + self.assertEqual(2,slice1.getMeshDimension()); + self.assertEqual(3,slice1.getSpaceDimension()); + self.assertEqual(10,slice1.getNumberOfNodes()); + self.assertEqual(1,slice1.getNumberOfCells()); + self.assertEqual(1,ids.getNumberOfTuples()); + self.assertEqual(5,slice1.getNodalConnectivity().getNumberOfTuples()); + self.assertEqual(2,slice1.getNodalConnectivityIndex().getNumberOfTuples()); + self.assertEqual(expected12,ids.getValues()); + self.assertEqual(expected13,slice1.getNodalConnectivity().getValues()); + self.assertEqual(expected14,slice1.getNodalConnectivityIndex().getValues()); + for i in range(27): + self.assertAlmostEqual(expected15[i],slice1.getCoords().getIJ(0,i),12); + pass pass - def testBuildSlice3DSurf1(self): mesh3D,mesh2D=MEDCouplingDataForTest.build3DExtrudedUMesh_1(); mesh2D=mesh3D.buildDescendingConnectivity()[0]; @@ -2661,7 +2658,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(expected1,ids.getValues()); self.assertEqual(expected2,slice1.getNodalConnectivity().getValues()); self.assertEqual(expected3,slice1.getNodalConnectivityIndex().getValues()); - for i in xrange(171): + for i in range(171): self.assertAlmostEqual(expected4[i],slice1.getCoords().getIJ(0,i),12); pass # @@ -2682,7 +2679,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(expected5,ids.getValues()); self.assertEqual(expected6,slice1.getNodalConnectivity().getValues()); self.assertEqual(expected7,slice1.getNodalConnectivityIndex().getValues()); - for i in xrange(135): + for i in range(135): self.assertAlmostEqual(expected8[i],slice1.getCoords().getIJ(0,i),12); pass pass @@ -2707,7 +2704,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected1=[1.,11.,2.,12.,4.,14.,6.,16.,7.,17.] self.assertEqual(5,tmp.getNumberOfTuples()); self.assertEqual(2,tmp.getNumberOfComponents()); - for i in xrange(10): + for i in range(10): self.assertAlmostEqual(expected1[i],tmp.getIJ(0,i),14); pass p=[(0,2),(0,2),(5,6)] @@ -2715,7 +2712,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected2=[1.,11.,2.,12.,1.,11.,2.,12.,6.,16.] self.assertEqual(5,tmp.getNumberOfTuples()); self.assertEqual(2,tmp.getNumberOfComponents()); - for i in xrange(10): + for i in range(10): self.assertAlmostEqual(expected2[i],tmp.getIJ(0,i),14); pass p=[(0,2),(-1,2),(5,6)] @@ -2726,34 +2723,34 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da2=DataArrayDouble.New(); da2.setValues(data2,5,2); # - dac=da.deepCpy(); - dac.setContigPartOfSelectedValues2(1,da2,2,4,1); + dac=da.deepCopy(); + dac.setContigPartOfSelectedValuesSlice(1,da2,2,4,1); expected3=[1.,11.,0.,30.,11.,41.,4.,14.,5.,15.,6.,16.,7.,17.] - for i in xrange(14): + for i in range(14): self.assertAlmostEqual(expected3[i],dac.getIJ(0,i),14); pass # - dac=da.deepCpy(); - self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues2,3,da2,0,5,1); - self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues2,0,da2,4,6,1); - self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues2,3,da2,5,0,1); - dac.setContigPartOfSelectedValues2(3,da2,1,5,1); + dac=da.deepCopy(); + self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValuesSlice,3,da2,0,5,1); + self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValuesSlice,0,da2,4,6,1); + self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValuesSlice,3,da2,5,0,1); + dac.setContigPartOfSelectedValuesSlice(3,da2,1,5,1); expected4=[1.,11.,2.,12.,3.,13.,9.,39.,0.,30.,11.,41.,12.,42.] - for i in xrange(14): + for i in range(14): self.assertAlmostEqual(expected4[i],dac.getIJ(0,i),14); pass # ids=DataArrayInt.New(); ids.alloc(3,1); - dac=da.deepCpy(); + dac=da.deepCopy(); ids.setIJ(0,0,2); ids.setIJ(1,0,0); ids.setIJ(2,0,4); dac.setContigPartOfSelectedValues(2,da2,ids); expected5=[1.,11.,2.,12.,0.,30.,8.,38.,12.,42.,6.,16.,7.,17.] - for i in xrange(14): + for i in range(14): self.assertAlmostEqual(expected5[i],dac.getIJ(0,i),14); pass # - dac=da.deepCpy(); + dac=da.deepCopy(); ids.setIJ(0,0,2); ids.setIJ(1,0,5); ids.setIJ(2,0,4); self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues,1,da2,ids); ids.setIJ(0,0,2); ids.setIJ(1,0,2); ids.setIJ(2,0,-1); @@ -2762,10 +2759,10 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues,5,da2,ids); # ids.setIJ(0,0,2); ids.setIJ(1,0,2); ids.setIJ(2,0,1); - dac=da.deepCpy(); + dac=da.deepCopy(); dac.setContigPartOfSelectedValues(4,da2,ids); expected6=[1.,11.,2.,12.,3.,13.,4.,14.,0.,30.,0.,30.,9.,39.] - for i in xrange(14): + for i in range(14): self.assertAlmostEqual(expected6[i],dac.getIJ(0,i),14); pass pass @@ -2790,7 +2787,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected1=[1,11,2,12,4,14,6,16,7,17] self.assertEqual(5,tmp.getNumberOfTuples()); self.assertEqual(2,tmp.getNumberOfComponents()); - for i in xrange(10): + for i in range(10): self.assertEqual(expected1[i],tmp.getIJ(0,i)); pass p=[(0,2),(0,2),(5,6)] @@ -2798,7 +2795,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): expected2=[1,11,2,12,1,11,2,12,6,16] self.assertEqual(5,tmp.getNumberOfTuples()); self.assertEqual(2,tmp.getNumberOfComponents()); - for i in xrange(10): + for i in range(10): self.assertEqual(expected2[i],tmp.getIJ(0,i)); pass p=[(0,2),(-1,2),(5,6)] @@ -2809,34 +2806,34 @@ class MEDCouplingBasicsTest3(unittest.TestCase): da2=DataArrayInt.New(); da2.setValues(data2,5,2); # - dac=da.deepCpy(); - dac.setContigPartOfSelectedValues2(1,da2,2,4,1); + dac=da.deepCopy(); + dac.setContigPartOfSelectedValuesSlice(1,da2,2,4,1); expected3=[1,11,0,30,11,41,4,14,5,15,6,16,7,17] - for i in xrange(14): + for i in range(14): self.assertEqual(expected3[i],dac.getIJ(0,i)); pass # - dac=da.deepCpy(); - self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues2,3,da2,0,5,1); - self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues2,0,da2,4,6,1); - self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues2,3,da2,5,0,1); - dac.setContigPartOfSelectedValues2(3,da2,1,5,1); + dac=da.deepCopy(); + self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValuesSlice,3,da2,0,5,1); + self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValuesSlice,0,da2,4,6,1); + self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValuesSlice,3,da2,5,0,1); + dac.setContigPartOfSelectedValuesSlice(3,da2,1,5,1); expected4=[1,11,2,12,3,13,9,39,0,30,11,41,12,42] - for i in xrange(14): + for i in range(14): self.assertEqual(expected4[i],dac.getIJ(0,i)); pass # ids=DataArrayInt.New(); ids.alloc(3,1); - dac=da.deepCpy(); + dac=da.deepCopy(); ids.setIJ(0,0,2); ids.setIJ(1,0,0); ids.setIJ(2,0,4); dac.setContigPartOfSelectedValues(2,da2,ids); expected5=[1,11,2,12,0,30,8,38,12,42,6,16,7,17] - for i in xrange(14): + for i in range(14): self.assertEqual(expected5[i],dac.getIJ(0,i)); pass # - dac=da.deepCpy(); + dac=da.deepCopy(); ids.setIJ(0,0,2); ids.setIJ(1,0,5); ids.setIJ(2,0,4); self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues,1,da2,ids); ids.setIJ(0,0,2); ids.setIJ(1,0,2); ids.setIJ(2,0,-1); @@ -2845,10 +2842,10 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertRaises(InterpKernelException,dac.setContigPartOfSelectedValues,5,da2,ids); # ids.setIJ(0,0,2); ids.setIJ(1,0,2); ids.setIJ(2,0,1); - dac=da.deepCpy(); + dac=da.deepCopy(); dac.setContigPartOfSelectedValues(4,da2,ids); expected6=[1,11,2,12,3,13,4,14,0,30,0,30,9,39] - for i in xrange(14): + for i in range(14): self.assertEqual(expected6[i],dac.getIJ(0,i)); pass pass @@ -2857,7 +2854,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): mesh=MEDCouplingDataForTest.build3DSourceMesh_1(); # mesh2,desc,descIndx,revDesc,revDescIndx=mesh.buildDescendingConnectivity2(); - mesh2.checkCoherency(); + mesh2.checkConsistencyLight(); self.assertEqual(2,mesh2.getMeshDimension()); self.assertEqual(30,mesh2.getNumberOfCells()); self.assertEqual(31,revDescIndx.getNbOfElems()); self.assertEqual(31,revDescIndx.getNumberOfTuples()); @@ -2893,9 +2890,9 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m1.setCoords(myCoords1); # vec1=[0.,0.,1.] - for i in xrange(18): + for i in range(18): vec2=[3.*cos(pi/9.*i),3.*sin(pi/9.*i)]; - m1Cpy=m1.deepCpy(); + m1Cpy=m1.deepCopy(); m1Cpy.translate(vec2); self.assertRaises(InterpKernelException,m1Cpy.are2DCellsNotCorrectlyOriented,vec1,False); m1Cpy.changeSpaceDimension(3); @@ -2912,13 +2909,13 @@ class MEDCouplingBasicsTest3(unittest.TestCase): d2=d1.convertToIntArr(); # d1.abs(); - for i in xrange(12): + for i in range(12): self.assertAlmostEqual(expected1[i],d1.getIJ(0,i),14); pass # expected2=[2,3,5,6,7,8,9,10,11,12,13,15] d2.abs(); - for i in xrange(12): + for i in range(12): self.assertEqual(expected2[i],d2.getIJ(0,i)); pass # @@ -2947,7 +2944,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(5,arr1.getNumberOfTuples()); self.assertEqual(3,arr1.getNumberOfComponents()); expected1=[5.7,57.,570.,6.5,65.,650.,5.,50.,500.,8.,80.,800.,7.,70.,700.] - for i in xrange(15): + for i in range(15): self.assertAlmostEqual(expected1[i],arr1.getIJ(0,i),14); pass pass @@ -2967,7 +2964,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): m1c.setCoordsAt(0,coordsX); expected1=[[0,1],[1,2],[2,3],[3,4]] self.assertEqual(4,m1c.getNumberOfCells()) - for i in xrange(m1c.getNumberOfCells()): + for i in range(m1c.getNumberOfCells()): self.assertEqual(expected1[i],m1c.getNodeIdsOfCell(i)) pass # test in 2D @@ -2975,7 +2972,7 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(12,m1c.getNumberOfCells()) self.assertEqual(20,m1c.getNumberOfNodes()) expected2=[[0,1,6,5],[1,2,7,6],[2,3,8,7],[3,4,9,8],[5,6,11,10],[6,7,12,11],[7,8,13,12],[8,9,14,13],[10,11,16,15],[11,12,17,16],[12,13,18,17],[13,14,19,18]] - for i in xrange(m1c.getNumberOfCells()): + for i in range(m1c.getNumberOfCells()): self.assertEqual(expected2[i],m1c.getNodeIdsOfCell(i)) pass # test in 3D @@ -2984,11 +2981,11 @@ class MEDCouplingBasicsTest3(unittest.TestCase): self.assertEqual(60,m1c.getNumberOfNodes()) expected3=[[0,1,6,5,20,21,26,25],[1,2,7,6,21,22,27,26],[2,3,8,7,22,23,28,27],[3,4,9,8,23,24,29,28],[5,6,11,10,25,26,31,30],[6,7,12,11,26,27,32,31],[7,8,13,12,27,28,33,32],[8,9,14,13,28,29,34,33],[10,11,16,15,30,31,36,35],[11,12,17,16,31,32,37,36],[12,13,18,17,32,33,38,37],[13,14,19,18,33,34,39,38],[20,21,26,25,40,41,46,45],[21,22,27,26,41,42,47,46],[22,23,28,27,42,43,48,47],[23,24,29,28,43,44,49,48],[25,26,31,30,45,46,51,50],[26,27,32,31,46,47,52,51],[27,28,33,32,47,48,53,52],[28,29,34,33,48,49,54,53],[30,31,36,35,50,51,56,55],[31,32,37,36,51,52,57,56],[32,33,38,37,52,53,58,57],[33,34,39,38,53,54,59,58]] self.assertEqual(24,m1c.getNumberOfCells()) - for i in xrange(m1c.getNumberOfCells()): + for i in range(m1c.getNumberOfCells()): self.assertEqual(expected3[i],m1c.getNodeIdsOfCell(i)) pass pass - + pass if __name__ == '__main__':