From: ageay Date: Thu, 4 Apr 2013 12:32:48 +0000 (+0000) Subject: MEDMEM suppression X-Git-Tag: EndAGWork4413~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=935c133d7ae4bdc7e78f5545556b7a2153872c80;p=modules%2Fmed.git MEDMEM suppression --- diff --git a/src/INTERP_KERNELTest/PointLocatorTest.cxx b/src/INTERP_KERNELTest/PointLocatorTest.cxx deleted file mode 100644 index cbe75e6c9..000000000 --- a/src/INTERP_KERNELTest/PointLocatorTest.cxx +++ /dev/null @@ -1,215 +0,0 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include "PointLocatorTest.hxx" -#include "PointLocator.hxx" -#include "MEDMeshMaker.hxx" -#include "MEDMEM_Mesh.hxx" - -#include -#include - -namespace INTERP_TEST -{ - - - void PointLocatorTest::setUp() - { - } - - - void PointLocatorTest::tearDown() - { - } - - /** - * Test that creates a tree in 2D and check that - * the results are correct in three - * cases : - * a non matching search - * a standard case - * a bbox overlapping the bboxes of the tree - */ - void PointLocatorTest::test_PointLocator() { - MEDMEM::MESH* mesh2D= MEDMeshMaker(2,2,MED_EN::MED_QUAD4); - MEDMEM::PointLocator pl(*mesh2D) ; - double x[2]={0.0,0.0}; - std::list elems = pl.locate(x); - CPPUNIT_ASSERT_EQUAL(1,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,(int)(*(elems.begin()))); - elems.clear(); - - double x2[2]={0.25,0.25}; - elems = pl.locate(x2); - CPPUNIT_ASSERT_EQUAL(1,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,(int)(*(elems.begin()))); - elems.clear(); - - double x3[2]={0.5,0.5}; - elems = pl.locate(x3); - CPPUNIT_ASSERT_EQUAL(4,(int)elems.size()); - elems.clear(); - - double x4[2]={-1.0,0.0}; - elems = pl.locate(x4); - CPPUNIT_ASSERT_EQUAL(0,(int)elems.size()); - elems.clear(); - delete mesh2D; - - MEDMEM::MESH* mesh3D= MEDMeshMaker(3,2,MED_EN::MED_HEXA8); - MEDMEM::PointLocator pl3(*mesh3D); - double xx[3]={0.0,0.0,0.0}; - elems = pl3.locate(xx); - CPPUNIT_ASSERT_EQUAL(1,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,(int)*(elems.begin())); - elems.clear(); - - double xx2[3]={0.25,0.25,0.25}; - elems = pl3.locate(xx2); - CPPUNIT_ASSERT_EQUAL(1,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,(int)*(elems.begin())); - elems.clear(); - - double xx3[3]={0.5,0.5,0.5}; - elems = pl3.locate(xx3); - CPPUNIT_ASSERT_EQUAL(8,(int)elems.size()); - elems.clear(); - - double xx4[3]={-1.0,0.0,0.0}; - elems = pl3.locate(xx4); - CPPUNIT_ASSERT_EQUAL(0,(int)elems.size()); - elems.clear(); - delete mesh3D; - - } - - /** - * Test that the results are correct in three - * cases : - * a non matching search - * a standard case - * a bbox overlapping the bboxes of the tree - */ - void PointLocatorTest::test_PointLocatorInSimplex() - { - MEDMEM::MESH* mesh2D= MEDMeshMaker(2,2,MED_EN::MED_QUAD4); - // mesh is a quadrangle (0.0-1.0 x 0.0-1.0 ) - // 3 -- 6 -- 9 - // | | | - // 2 -- 5 -- 8 - // | | | - // 1 -- 4 -- 7 - MEDMEM::PointLocatorInSimplex pl(*mesh2D) ; - std::list elems; - std::list::iterator elem; - { - double x[2]={0.0,0.25}; - elems = pl.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(3,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,*elem++); - CPPUNIT_ASSERT_EQUAL(2,*elem++); - CPPUNIT_ASSERT_EQUAL(5,*elem++); - } - { - double x[2]={0.25,0.0}; - elems = pl.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(3,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,*elem++); - CPPUNIT_ASSERT_EQUAL(2,*elem++); - CPPUNIT_ASSERT_EQUAL(4,*elem++); - } - { - double x[2]={0.25,1.0}; - elems = pl.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(3,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(2,*elem++); - CPPUNIT_ASSERT_EQUAL(3,*elem++); - CPPUNIT_ASSERT_EQUAL(6,*elem++); - } - { - double x[2]={0.4,0.75}; - elems = pl.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(3,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(3,*elem++); - CPPUNIT_ASSERT_EQUAL(6,*elem++); - CPPUNIT_ASSERT_EQUAL(5,*elem++); - } - { - double x[2]={-1.0,0.0}; - elems = pl.locate(x); - CPPUNIT_ASSERT_EQUAL(0,(int)elems.size()); - delete mesh2D; - } - MEDMEM::MESH* mesh3D= MEDMeshMaker(3,2,MED_EN::MED_HEXA8); - // ^Z - // | - // 3 -- 6 -- 9 - // | | | - // 2 -- 5 -- 8 12 --15 --18 - // | | | | | | - // 1 -- 4 -- 7->Y 11 --14 --17 21 --24 --27 - // \ | | | | | | - // \ X 10 --13 --16 20 --23 --26 - // v | | | - // 19 --22 --25 - - MEDMEM::PointLocatorInSimplex pl3(*mesh3D); - { - double x[3]={0.0,0.0,0.0}; - elems = pl3.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(4,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,*elem++); - CPPUNIT_ASSERT_EQUAL(10,*elem++); - CPPUNIT_ASSERT_EQUAL(13,*elem++); - CPPUNIT_ASSERT_EQUAL(2,*elem++); - } - { - double x[3]={0.0,0.4,0.3}; - elems = pl3.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(4,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,*elem++); - CPPUNIT_ASSERT_EQUAL(10,*elem++); - CPPUNIT_ASSERT_EQUAL(4,*elem++); - CPPUNIT_ASSERT_EQUAL(5,*elem++); - } - { - double x[3]={0.5,0.5,0.5}; - elems = pl3.locate(x); - elem = elems.begin(); - CPPUNIT_ASSERT_EQUAL(4,(int)elems.size()); - CPPUNIT_ASSERT_EQUAL(1,*elem++); - CPPUNIT_ASSERT_EQUAL(10,*elem++); - CPPUNIT_ASSERT_EQUAL(13,*elem++); - CPPUNIT_ASSERT_EQUAL(14,*elem++); - } - { - double x[3]={-1.0,0.0,0.0}; - elems = pl3.locate(x); - CPPUNIT_ASSERT_EQUAL(0,(int)elems.size()); - } - delete mesh3D; - } - -} diff --git a/src/INTERP_KERNELTest/PointLocatorTest.hxx b/src/INTERP_KERNELTest/PointLocatorTest.hxx deleted file mode 100644 index 2c98b255f..000000000 --- a/src/INTERP_KERNELTest/PointLocatorTest.hxx +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef __TU_POINTLOCATOR_HXX__ -#define __TU_POINTLOCATOR_HXX__ - -#include "InterpKernelTestExport.hxx" -#include "PointLocator.hxx" - -#include - -namespace INTERP_TEST -{ - - /** - * \brief Test suite testing some of the low level methods of TransformedTriangle. - * - */ - class INTERPKERNELTEST_EXPORT PointLocatorTest : public CppUnit::TestFixture - { - - CPPUNIT_TEST_SUITE( PointLocatorTest ); - CPPUNIT_TEST( test_PointLocator ); - CPPUNIT_TEST( test_PointLocatorInSimplex ); - CPPUNIT_TEST_SUITE_END(); - - - public: - void setUp(); - - void tearDown(); - - // tests - void test_PointLocator(); - void test_PointLocatorInSimplex(); - - }; - - - - -} - -#endif