*** empty log message ***

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx
index bbc255b7b875324c4f98c850473505ee43176dbc..ff3c522fdda0eb56530b6a258576a7e7a4058d53 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.cxx
@@ -2061,3 +2061,75 @@ void MEDCouplingBasicsTest4::testFindNodesOnLine1()
   //
   mesh->decrRef();
 }
+
+void MEDCouplingBasicsTest4::testIntersect2DMeshesTmp2()
+{
+  MEDCouplingCMesh *m1c=MEDCouplingCMesh::New();
+  DataArrayDouble *coordsX1=DataArrayDouble::New();
+  const double arrX1[4]={ 0., 1., 1.5, 2. };
+  coordsX1->alloc(4,1);
+  std::copy(arrX1,arrX1+4,coordsX1->getPointer());
+  m1c->setCoordsAt(0,coordsX1);
+  DataArrayDouble *coordsY1=DataArrayDouble::New();
+  const double arrY1[3]={ 0., 1.5, 3.};
+  coordsY1->alloc(3,1);
+  std::copy(arrY1,arrY1+3,coordsY1->getPointer());
+  m1c->setCoordsAt(1,coordsY1);
+  MEDCouplingUMesh *m1=m1c->buildUnstructured();
+  //
+  MEDCouplingCMesh *m2c=MEDCouplingCMesh::New();
+  DataArrayDouble *coordsX2=DataArrayDouble::New();
+  const double arrX2[3]={ 0., 1., 2. };
+  coordsX2->alloc(3,1);
+  std::copy(arrX2,arrX2+3,coordsX2->getPointer());
+  m2c->setCoordsAt(0,coordsX2);
+  DataArrayDouble *coordsY2=DataArrayDouble::New();
+  coordsY2->alloc(3,1);
+  const double arrY2[3]={ 0., 1., 3.};
+  std::copy(arrY2,arrY2+3,coordsY2->getPointer());
+  m2c->setCoordsAt(1,coordsY2);
+  MEDCouplingUMesh *m2=m2c->buildUnstructured();
+  //
+  DataArrayInt *d1=0,*d2=0;
+  MEDCouplingUMesh *m3=MEDCouplingUMesh::Intersect2DMeshes(m1,m2,1e-10,d1,d2);
+  const int expected1[9]={0,0,1,1,2,2,3,4,5};
+  const int expected2[9]={0,2,1,3,1,3,2,3,3};
+  CPPUNIT_ASSERT_EQUAL(9,d1->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(9,d2->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(9,m3->getNumberOfCells());
+  CPPUNIT_ASSERT_EQUAL(22,m3->getNumberOfNodes());
+  CPPUNIT_ASSERT_EQUAL(2,m3->getSpaceDimension());
+  CPPUNIT_ASSERT(std::equal(expected1,expected1+9,d1->getConstPointer()));
+  CPPUNIT_ASSERT(std::equal(expected2,expected2+9,d2->getConstPointer()));
+  const int expected3[45]={5,16,13,12,15,5,15,4,5,16,5,21,2,13,16,5,16,5,6,21,5,17,14,2,21,5,21,6,7,17,5,4,18,19,5,5,5,19,10,6,5,6,10,20,7};
+  const int expected4[10]={0,5,10,15,20,25,30,35,40,45};
+  const double expected5[44]={0.0,0.0,1.0,0.0,1.5,0.0,2.0,0.0,0.0,1.5,1.0,1.5,1.5,1.5,2.0,1.5,0.0,3.0,1.0,3.0,1.5,3.0,2.0,3.0,0.0,0.0,1.0,0.0,2.0,0.0,0.0,1.0,1.0,1.0,2.0,1.0,0.0,3.0,1.0,3.0,2.0,3.0,1.5,1.0};
+  CPPUNIT_ASSERT_EQUAL(45,m3->getNodalConnectivity()->getNumberOfTuples());
+  CPPUNIT_ASSERT_EQUAL(10,m3->getNodalConnectivityIndex()->getNumberOfTuples());
+  CPPUNIT_ASSERT(std::equal(expected3,expected3+45,m3->getNodalConnectivity()->getConstPointer()));
+  CPPUNIT_ASSERT(std::equal(expected4,expected4+10,m3->getNodalConnectivityIndex()->getConstPointer()));
+  for(int i=0;i<44;i++)
+    CPPUNIT_ASSERT_DOUBLES_EQUAL(expected5[i],m3->getCoords()->getIJ(0,i),1e-12);
+  d1->decrRef();
+  d2->decrRef();
+  m3->decrRef();
+  //
+  m1c->decrRef();
+  coordsX1->decrRef();
+  coordsY1->decrRef();
+  m1->decrRef();
+  m2c->decrRef();
+  coordsX2->decrRef();
+  coordsY2->decrRef();
+  m2->decrRef();
+}
+
+void MEDCouplingBasicsTest4::testBuildPartOfMySelfSafe1()
+{
+  MEDCouplingUMesh *mesh=build2DTargetMesh_1();
+  const int input1[4]={0,-1,4,2};
+  const int input2[4]={0,4,5,4};
+  CPPUNIT_ASSERT_THROW(mesh->buildPartOfMySelf(input1,input1+4,true),INTERP_KERNEL::Exception);
+  CPPUNIT_ASSERT_THROW(mesh->buildPartOfMySelf(input2,input2+4,true),INTERP_KERNEL::Exception);
+  mesh->decrRef();
+}

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx
index d36129c98d37f838404e4a111c3de75026bdf781..e1d2516346b6e6c3f688d645d3ebedf2810c8da2 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest4.hxx
@@ -90,6 +90,8 @@ namespace ParaMEDMEM
     CPPUNIT_TEST( testBuildDescendingConnec2 );
     CPPUNIT_TEST( testIntersect2DMeshesTmp1 );
     CPPUNIT_TEST( testFindNodesOnLine1 );
+    CPPUNIT_TEST( testIntersect2DMeshesTmp2 );
+    CPPUNIT_TEST( testBuildPartOfMySelfSafe1 );
     CPPUNIT_TEST_SUITE_END();
   public:
     void testDescriptionInMeshTimeUnit1();
@@ -149,6 +151,8 @@ namespace ParaMEDMEM
     void testBuildDescendingConnec2();
     void testIntersect2DMeshesTmp1();
     void testFindNodesOnLine1();
+    void testIntersect2DMeshesTmp2();
+    void testBuildPartOfMySelfSafe1();
   };
 }
 

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
index 0091508ea49654c7942b67209ecd16033f567f3a..0f25fee047c4163d57993a10f806d7ea6ef7438d 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
@@ -8150,6 +8150,57 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(3,len(res));
         self.assertEqual(expected1,res);
         pass
+
+    def testIntersect2DMeshesTmp2(self):
+        m1c=MEDCouplingCMesh.New();
+        coordsX1=DataArrayDouble.New();
+        arrX1=[ 0., 1., 1.5, 2. ]
+        coordsX1.setValues(arrX1,4,1);
+        m1c.setCoordsAt(0,coordsX1);
+        coordsY1=DataArrayDouble.New();
+        arrY1=[ 0., 1.5, 3.]
+        coordsY1.setValues(arrY1,3,1);
+        m1c.setCoordsAt(1,coordsY1);
+        m1=m1c.buildUnstructured();
+        m2c=MEDCouplingCMesh.New();
+        coordsX2=DataArrayDouble.New();
+        arrX2=[ 0., 1., 2. ]
+        coordsX2.setValues(arrX2,3,1);
+        m2c.setCoordsAt(0,coordsX2);
+        coordsY2=DataArrayDouble.New();
+        arrY2=[ 0., 1., 3.]
+        coordsY2.setValues(arrY2,3,1);
+        m2c.setCoordsAt(1,coordsY2);
+        m2=m2c.buildUnstructured();
+        #
+        m3,d1,d2=MEDCouplingUMesh.Intersect2DMeshes(m1,m2,1e-10)
+        #
+        expected1=[0,0,1,1,2,2,3,4,5]
+        expected2=[0,2,1,3,1,3,2,3,3]
+        self.assertEqual(9,d1.getNumberOfTuples());
+        self.assertEqual(9,d2.getNumberOfTuples());
+        self.assertEqual(9,m3.getNumberOfCells());
+        self.assertEqual(22,m3.getNumberOfNodes());
+        self.assertEqual(2,m3.getSpaceDimension());
+        self.assertEqual(expected1,d1.getValues());
+        self.assertEqual(expected2,d2.getValues());
+        expected3=[5,16,13,12,15,5,15,4,5,16,5,21,2,13,16,5,16,5,6,21,5,17,14,2,21,5,21,6,7,17,5,4,18,19,5,5,5,19,10,6,5,6,10,20,7]
+        expected4=[0,5,10,15,20,25,30,35,40,45]
+        expected5=[0.0,0.0,1.0,0.0,1.5,0.0,2.0,0.0,0.0,1.5,1.0,1.5,1.5,1.5,2.0,1.5,0.0,3.0,1.0,3.0,1.5,3.0,2.0,3.0,0.0,0.0,1.0,0.0,2.0,0.0,0.0,1.0,1.0,1.0,2.0,1.0,0.0,3.0,1.0,3.0,2.0,3.0,1.5,1.0]
+        self.assertEqual(45,m3.getNodalConnectivity().getNumberOfTuples());
+        self.assertEqual(10,m3.getNodalConnectivityIndex().getNumberOfTuples());
+        self.assertEqual(expected3,m3.getNodalConnectivity().getValues());
+        self.assertEqual(expected4,m3.getNodalConnectivityIndex().getValues());
+        for i in xrange(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)
+        self.assertRaises(InterpKernelException,mesh.buildPartOfMySelf,[0,4,5,4],True)
+        pass
     
     def setUp(self):
         pass