From c24deb497d70cc2fef718b507a17e370918abadc Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 4 Apr 2013 10:52:13 +0000 Subject: [PATCH] MEDMEM suppression --- src/CMakeLists.txt | 4 +- src/INTERP_KERNELTest/RemapperTest.cxx | 96 -------------------------- src/Makefile.am | 4 +- 3 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 src/INTERP_KERNELTest/RemapperTest.cxx diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f89a22bb..5ef02c6bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,9 +54,9 @@ ENDIF(MPI_IS_OK) IF(MED_ENABLE_SPLITTER) IF(MED_ENABLE_MED3) SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDPartitioner) - SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDSPLITTER) + SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS}) IF(SWIG_STATUS) - SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDSPLITTER_Swig) + SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS}) ENDIF(SWIG_STATUS) ENDIF(MED_ENABLE_MED3) ENDIF(MED_ENABLE_SPLITTER) diff --git a/src/INTERP_KERNELTest/RemapperTest.cxx b/src/INTERP_KERNELTest/RemapperTest.cxx deleted file mode 100644 index 01c7b4596..000000000 --- a/src/INTERP_KERNELTest/RemapperTest.cxx +++ /dev/null @@ -1,96 +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 "RemapperTest.hxx" -#include "Remapper.hxx" -#include "TestInterpKernelUtils.hxx" - -#include -#include - -namespace INTERP_TEST -{ - - - void RemapperTest::setUp() - { - } - - - void RemapperTest::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 RemapperTest::test_Remapper() { - string sourcename=INTERP_TEST::getResourceFile("square1.med"); - MEDMEM::MESH source_mesh (MED_DRIVER,sourcename,"Mesh_2"); - - string targetname=INTERP_TEST::getResourceFile("square2.med"); - MEDMEM::MESH target_mesh (MED_DRIVER,targetname,"Mesh_3"); - - MEDMEM::SUPPORT source_support(&source_mesh,"on All support"); - MEDMEM::FIELD source_field(&source_support,1); - double* value=const_cast(source_field.getValue()); - for (int i=0; i target_field(&target_support,1); - double* targetvalue=const_cast(target_field.getValue()); - for (int i=0; i *source_areas=source_mesh.getArea(&source_support); - MEDMEM::FIELD *target_areas=target_mesh.getArea(&target_support); - absField(*source_areas); //absolute value - absField(*target_areas); //absolute value - - //target square is in reverse order as compared to initial square - double source_integral=source_field.normL2(1,source_areas); - double target_integral=target_field.normL2(1,target_areas); - - CPPUNIT_ASSERT_DOUBLES_EQUAL(source_integral,target_integral,1e-10); - delete source_areas; - delete target_areas; - - } - - void RemapperTest::absField(MEDMEM::FIELD& field) - { - double* areas=const_cast(field.getValue()); - for (int i=0; i< field.getNumberOfValues();i++) - { - areas[i]=fabs(areas[i]); - } - } - -} diff --git a/src/Makefile.am b/src/Makefile.am index 2a54652e6..d8f3bdbd2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -66,7 +66,7 @@ if MPI_IS_OK endif if MED_ENABLE_SPLITTER - SPLITTER_SUBDIRS = MEDSPLITTER MEDSPLITTER_Swig MEDPartitioner + SPLITTER_SUBDIRS = MEDPartitioner endif if MED_ENABLE_RENUMBER @@ -99,6 +99,6 @@ SUBDIRS = $(COMMON_SUBDIRS) $(PARAMEDMEM_SUBDIRS) $(BASE_SUBDIRS) $(INTERPTEST_S DIST_SUBDIRS= \ MEDWrapper INTERP_KERNEL MEDCoupling MEDCoupling_Swig \ INTERP_KERNELTest ParaMEDMEM ParaMEDMEM_Swig MEDLoader \ - MEDSPLITTER MEDSPLITTER_Swig MEDPartitioner RENUMBER MEDCouplingCorba MEDCouplingCorba_Swig \ + MEDPartitioner RENUMBER MEDCouplingCorba MEDCouplingCorba_Swig \ ParaMEDLoader ParaMEDMEMComponent \ ParaMEDCouplingCorba MEDCalculator MEDGUI MEDOP ParaMEDMEMTest -- 2.39.2