From: rnv Date: Wed, 31 May 2017 08:28:10 +0000 (+0300) Subject: Fixing wrong merge: second attempt. X-Git-Tag: V8_4_0a1~27 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=080c53bebfe53ac8def9d03e2f1f14093025a6fe;p=tools%2Fmedcoupling.git Fixing wrong merge: second attempt. --- diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py index 1719e3488..5929051f4 100644 --- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py +++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py @@ -696,7 +696,7 @@ class MEDCouplingBasicsTest5(unittest.TestCase): self.assertRaises(InterpKernelException,m.buildUnstructured().splitProfilePerType,invalidPfl) ## pfl1=DataArrayInt([1,2,3]) - a=m.getCellsContainingPointcheckTypeConsistencyAndContig([NORM_QUAD4,3,0],[pfl1]) + a=m.checkTypeConsistencyAndContig([NORM_QUAD4,3,0],[pfl1]) b=m.buildUnstructured().checkTypeConsistencyAndContig([NORM_QUAD4,3,0],[pfl1]) self.assertTrue(a.isEqual(b) and pfl1.getHiddenCppPointer(),a.getHiddenCppPointer()) #