merge conflict

[tools/medcoupling.git] / src / MEDCoupling / Test / MEDCouplingRemapperTest.cxx

diff --git a/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx b/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
index 662ad77a6a7be1a83e097530d1008a353d352d20..f8a2e37babc16b3067dfd990fb39ed156e42da73 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingRemapperTest.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015  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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -126,7 +126,7 @@ void MEDCouplingRemapperTest::test2DInterpP0P0R_1()
   
   MEDCouplingFieldDouble *targetField=MEDCouplingFieldDouble::New(ON_CELLS);
   targetField->setNature(ConservativeVolumic);
-  targetField->setMesh(sourceMesh);
+  targetField->setMesh(targetMesh);
   DataArrayDouble *array=DataArrayDouble::New();
   array->alloc(targetMesh->getNumberOfCells(),1);
   targetField->setArray(array);
@@ -938,7 +938,7 @@ void MEDCouplingRemapperTest::testExtruded2()
   //
   MEDCouplingRemapper remapper;
   remapper.setPrecision(1e-12);
-  remapper.setIntersectionType(INTERP_KERNEL::Geometric2D);
+  remapper.setIntersectionType(INTERP_KERNEL::Triangulation);
   CPPUNIT_ASSERT_EQUAL(1,remapper.prepare(meshNE,meshTTE,"P0P0"));
   MEDCouplingFieldDouble *srcField=MEDCouplingFieldDouble::New(ON_CELLS);
   srcField->setNature(IntegralGlobConstraint);