X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMTest%2FParaMEDMEMTestMPI2_1.cxx;h=4a3a4cda9a90bf62809f28e087b593fab9569dd0;hb=ffb8188e28b2b60ee207a8644286821bc4e8fcdc;hp=cd42188bd2fa6cfe55e4c21a426cb3c7026c7ca6;hpb=378cb2ebe08f8f4543ef632b2bd5f77fe180f978;p=tools%2Fmedcoupling.git

diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx
old mode 100755
new mode 100644
index cd42188bd..4a3a4cda9
--- a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  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
@@ -41,7 +41,7 @@ public:
   void testBasicMPI2_1();
 };
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 void MPI2ParaMEDMEMTest::testBasicMPI2_1()
 {
@@ -49,11 +49,11 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
   MPI_Comm gcom;
   std::string service = "SERVICE";
   std::ostringstream meshfilename, meshname;
-  ParaMEDMEM::ParaMESH *paramesh=0;
-  ParaMEDMEM::MEDCouplingUMesh *mesh;
-  ParaMEDMEM::ParaFIELD *parafield=0;
-  ParaMEDMEM::CommInterface *interface;
-  ParaMEDMEM::MPIProcessorGroup *source, *target;
+  MEDCoupling::ParaMESH *paramesh=0;
+  MEDCoupling::MEDCouplingUMesh *mesh;
+  MEDCoupling::ParaFIELD *parafield=0;
+  MEDCoupling::CommInterface *interface;
+  MEDCoupling::MPIProcessorGroup *source, *target;
 
   MPI_Comm_size( MPI_COMM_WORLD, &lsize );
   MPI_Comm_rank( MPI_COMM_WORLD, &lrank );
@@ -63,7 +63,7 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
       return;
     }
 
-  /* Connection to remote programm */
+  /* Connection to remote program */
   MPI2Connector *mpio = new MPI2Connector;
   gcom = mpio->remoteMPI2Connect(service);
   MPI_Comm_size( gcom, &gsize );
@@ -73,14 +73,14 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
       CPPUNIT_ASSERT(false);
       return;
     }
-  interface = new ParaMEDMEM::CommInterface;
-  source = new ParaMEDMEM::MPIProcessorGroup(*interface,0,lsize-1,gcom);
-  target = new ParaMEDMEM::MPIProcessorGroup(*interface,lsize,gsize-1,gcom);
+  interface = new MEDCoupling::CommInterface;
+  source = new MEDCoupling::MPIProcessorGroup(*interface,0,lsize-1,gcom);
+  target = new MEDCoupling::MPIProcessorGroup(*interface,lsize,gsize-1,gcom);
 
   const double sourceCoordsAll[2][8]={{0.4,0.5,0.4,1.5,1.6,1.5,1.6,0.5},
                                       {0.3,-0.5,1.6,-0.5,1.6,-1.5,0.3,-1.5}};
   
-  int conn4All[8]={0,1,2,3,4,5,6,7};
+  mcIdType conn4All[8]={0,1,2,3,4,5,6,7};
   
   std::ostringstream stream; stream << "sourcemesh2D proc " << grank;
   mesh=MEDCouplingUMesh::New(stream.str().c_str(),2);
@@ -94,13 +94,13 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
   mesh->setCoords(myCoords);
   myCoords->decrRef();
   paramesh=new ParaMESH(mesh,*source,"source mesh");
-  ParaMEDMEM::ComponentTopology comptopo;
+  MEDCoupling::ComponentTopology comptopo;
   parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo);
   double *value=parafield->getField()->getArray()->getPointer();
   value[0]=34+13*((double)grank);
 
-  ParaMEDMEM::InterpKernelDEC dec(*source,*target);
-  parafield->getField()->setNature(ConservativeVolumic);
+  MEDCoupling::InterpKernelDEC dec(*source,*target);
+  parafield->getField()->setNature(IntensiveMaximum);
 
 
   dec.setMethod("P0");
@@ -108,7 +108,7 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
   dec.synchronize();
   dec.setForcedRenormalization(false);
   dec.sendData();
-  /* Deconnection of remote programm */
+  /* Deconnection of remote program */
   mpio->remoteMPI2Disconnect(service);
   /* clean-up */
   delete mpio;