Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/medcoupling

[tools/medcoupling.git] / src / ParaMEDMEMTest / ParaMEDMEMTestMPI2_1.cxx

diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx
index 50cbc3eb20b0eb11709b94d379833bfb6505195b..4a3a4cda9a90bf62809f28e087b593fab9569dd0 100644 (file)
--- a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -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 );
@@ -80,7 +80,7 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
   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);
@@ -100,7 +100,7 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1()
   value[0]=34+13*((double)grank);
 
   MEDCoupling::InterpKernelDEC dec(*source,*target);
-  parafield->getField()->setNature(ConservativeVolumic);
+  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;