X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMTest%2FParaMEDMEMTest_StructuredCoincidentDEC.cxx;h=8f509f771f4c2fa7c4540a489226ff00c1d85c48;hb=d426837c21eca9b56b9b8a7a7434aaf3969c8977;hp=004e49df2474cfd922f57cf9bc742f6523d1f924;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git

diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
index 004e49df2..8f509f771 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  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
@@ -31,6 +31,7 @@
 #include "ComponentTopology.hxx"
 #include "ICoCoMEDField.hxx"
 #include "MEDLoader.hxx"
+#include "TestInterpKernelUtils.hxx"
 
 #include <string>
 
@@ -41,7 +42,7 @@
 #define ENABLE_FORCED_FAILURES
 
 using namespace std;
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 /*
  * Check methods defined in StructuredCoincidentDEC.hxx
@@ -65,18 +66,18 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
     return;
   }
 
-  ParaMEDMEM::CommInterface interface;
+  MEDCoupling::CommInterface interface;
 
-  ParaMEDMEM::MPIProcessorGroup self_group (interface,rank,rank);
-  ParaMEDMEM::MPIProcessorGroup target_group(interface,3,size-1);
-  ParaMEDMEM::MPIProcessorGroup source_group (interface,0,2);
+  MEDCoupling::MPIProcessorGroup self_group (interface,rank,rank);
+  MEDCoupling::MPIProcessorGroup target_group(interface,3,size-1);
+  MEDCoupling::MPIProcessorGroup source_group (interface,0,2);
 
-  ParaMEDMEM::MEDCouplingUMesh* mesh;
-  ParaMEDMEM::ParaMESH* paramesh;
-  ParaMEDMEM::ParaFIELD* parafield;
+  MEDCoupling::MEDCouplingUMesh* mesh;
+  MEDCoupling::ParaMESH* paramesh;
+  MEDCoupling::ParaFIELD* parafield;
 
-  string filename_xml1 = getResourceFile("square1_split");
-  string filename_2    = getResourceFile("square1.med");
+  string filename_xml1 = INTERP_TEST::getResourceFile("square1_split");
+  string filename_2    = INTERP_TEST::getResourceFile("square1.med");
   //string filename_seq_wr  = makeTmpFile("");
   //string filename_seq_med = makeTmpFile("myWrField_seq_pointe221.med");
 
@@ -85,7 +86,7 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
 
   //loading the geometry for the source group
 
-  ParaMEDMEM::StructuredCoincidentDEC dec(source_group, target_group);
+  MEDCoupling::StructuredCoincidentDEC dec(source_group, target_group);
 
   MPI_Barrier(MPI_COMM_WORLD);
   if (source_group.containsMyRank()) {
@@ -96,12 +97,12 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
     ostringstream meshname;
     meshname<< "Mesh_2_"<< rank+1;
 
-    mesh=MEDLoader::ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
+    mesh=ReadUMeshFromFile(strstream.str().c_str(),meshname.str().c_str(),0);
     
 
     paramesh=new ParaMESH (mesh,source_group,"source mesh");
 
-    ParaMEDMEM::ComponentTopology comptopo(6);
+    MEDCoupling::ComponentTopology comptopo(6);
     parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
 
     int nb_local=mesh->getNumberOfCells();
@@ -124,10 +125,10 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() {
   if (target_group.containsMyRank()) {
 
     string meshname2("Mesh_2");
-    mesh = MEDLoader::ReadUMeshFromFile(filename_2.c_str(),meshname2.c_str(),0);
+    mesh = ReadUMeshFromFile(filename_2.c_str(),meshname2.c_str(),0);
     
     paramesh=new ParaMESH (mesh,self_group,"target mesh");
-    ParaMEDMEM::ComponentTopology comptopo(6, &target_group);
+    MEDCoupling::ComponentTopology comptopo(6, &target_group);
 
     parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);