]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
MEDMEM suppression
authorageay <ageay>
Thu, 4 Apr 2013 10:52:13 +0000 (10:52 +0000)
committerageay <ageay>
Thu, 4 Apr 2013 10:52:13 +0000 (10:52 +0000)
src/CMakeLists.txt
src/INTERP_KERNELTest/RemapperTest.cxx [deleted file]
src/Makefile.am

index 4f89a22bb92fc9cb7f4a3a23128275fe9edefab1..5ef02c6bc88cc27ad807bc440222e2232a28b242 100644 (file)
@@ -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 (file)
index 01c7b45..0000000
+++ /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 <iostream>
-#include <vector>
-
-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<double> source_field(&source_support,1);
-    double* value=const_cast<double*>(source_field.getValue());
-    for (int i=0; i<source_support.getNumberOfElements(MED_EN::MED_ALL_ELEMENTS); i++)
-      value[i]=1.0;
-    
-    MEDMEM::SUPPORT target_support(&target_mesh,"on All support");
-    MEDMEM::FIELD<double> target_field(&target_support,1);
-    double* targetvalue=const_cast<double*>(target_field.getValue());
-    for (int i=0; i<target_support.getNumberOfElements(MED_EN::MED_ALL_ELEMENTS); i++)
-      targetvalue[i]=0.0;
-
-
-    INTERP_KERNEL::Remapper remapper;
-    remapper.prepare(source_mesh,target_mesh,"P0P0");
-    remapper.transfer(source_field,target_field);
-
-    MEDMEM::FIELD<double> *source_areas=source_mesh.getArea(&source_support);
-    MEDMEM::FIELD<double> *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<double>& field)
-  {
-    double* areas=const_cast<double*>(field.getValue());
-    for (int i=0; i< field.getNumberOfValues();i++)
-      {
-        areas[i]=fabs(areas[i]);
-      }
-  }
-
-}
index 2a54652e659267ea9c9d745e1335ecd6dad3cddf..d8f3bdbd2f86afb913570f0fbb2a15b6f2f60000 100644 (file)
@@ -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