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

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

diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx
index d01960c13fdccfacc7c8f3ca422ee5944aa562df..001d2ddcceab4013bead54a84d0fded8f71b45cb 100644 (file)
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  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
@@ -196,7 +196,7 @@ void prepareData1(int rank, NatureOfField nature,
       std::copy(coordsS,coordsS+10,myCoords->getPointer());
       meshS->setCoords(myCoords);
       myCoords->decrRef();
-      int connS[7]={0,3,4,1, 1,4,2};
+      mcIdType connS[7]={0,3,4,1, 1,4,2};
       meshS->allocateCells(2);
       meshS->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,connS);
       meshS->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connS+4);
@@ -215,7 +215,7 @@ void prepareData1(int rank, NatureOfField nature,
       std::copy(coordsT,coordsT+6,myCoords->getPointer());
       meshT->setCoords(myCoords);
       myCoords->decrRef();
-      int connT[3]={0,2,1};
+      mcIdType connT[3]={0,2,1};
       meshT->allocateCells(1);
       meshT->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connT);
       meshT->finishInsertingCells();
@@ -238,7 +238,7 @@ void prepareData1(int rank, NatureOfField nature,
       std::copy(coordsS,coordsS+10,myCoords->getPointer());
       meshS->setCoords(myCoords);
       myCoords->decrRef();
-      int connS[7]={0,1,2, 1,3,4,2};
+      mcIdType connS[7]={0,1,2, 1,3,4,2};
       meshS->allocateCells(2);
       meshS->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connS);
       meshS->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,connS+3);
@@ -257,7 +257,7 @@ void prepareData1(int rank, NatureOfField nature,
       std::copy(coordsT,coordsT+6,myCoords->getPointer());
       meshT->setCoords(myCoords);
       myCoords->decrRef();
-      int connT[3]={0,2,1};
+      mcIdType connT[3]={0,2,1};
       meshT->allocateCells(1);
       meshT->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connT);
       meshT->finishInsertingCells();
@@ -280,7 +280,7 @@ void prepareData1(int rank, NatureOfField nature,
       std::copy(coordsS,coordsS+8,myCoords->getPointer());
       meshS->setCoords(myCoords);
       myCoords->decrRef();
-      int connS[4]={0,2,3,1};
+      mcIdType connS[4]={0,2,3,1};
       meshS->allocateCells(1);
       meshS->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,connS);
       meshS->finishInsertingCells();
@@ -298,7 +298,7 @@ void prepareData1(int rank, NatureOfField nature,
       std::copy(coordsT,coordsT+6,myCoords->getPointer());
       meshT->setCoords(myCoords);
       myCoords->decrRef();
-      int connT[3]={0,1,2};
+      mcIdType connT[3]={0,1,2};
       meshT->allocateCells(1);
       meshT->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connT);
       meshT->finishInsertingCells();
@@ -319,7 +319,7 @@ void prepareData2_buildOneSquare(MEDCouplingUMesh* & meshS_0, MEDCouplingUMesh*
   myCoords->alloc(5,2);
   std::copy(coords,coords+10,myCoords->getPointer());
   meshS_0->setCoords(myCoords);  myCoords->decrRef();
-  int connS[4]={0,1,2,3};
+  mcIdType connS[4]={0,1,2,3};
   meshS_0->allocateCells(2);
   meshS_0->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,connS);
   //
@@ -329,7 +329,7 @@ void prepareData2_buildOneSquare(MEDCouplingUMesh* & meshS_0, MEDCouplingUMesh*
   std::copy(coords,coords+10,myCoords->getPointer());
   meshT_0->setCoords(myCoords);
   myCoords->decrRef();
-  int connT[12]={0,1,4,  1,2,4,  2,3,4,  3,0,4};
+  mcIdType connT[12]={0,1,4,  1,2,4,  2,3,4,  3,0,4};
   meshT_0->allocateCells(4);
   meshT_0->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connT);
   meshT_0->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,connT+3);
@@ -590,7 +590,7 @@ void ParaMEDMEMTest::testOverlapDEC3()
   MEDCouplingFieldDouble * resField = parafieldT->getField();
   if(rank==0)
     {
-      CPPUNIT_ASSERT_EQUAL(8, resField->getNumberOfTuples());
+      CPPUNIT_ASSERT_EQUAL(8, (int)resField->getNumberOfTuples());
       for(int i=0;i<4;i++)
         CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,resField->getArray()->getIJ(i,0),1e-12);
       for(int i=4;i<8;i++)
@@ -598,7 +598,7 @@ void ParaMEDMEMTest::testOverlapDEC3()
     }
   if(rank==1)
     {
-      CPPUNIT_ASSERT_EQUAL(12, resField->getNumberOfTuples());
+      CPPUNIT_ASSERT_EQUAL(12, (int)resField->getNumberOfTuples());
       for(int i=0;i<4;i++)
         CPPUNIT_ASSERT_DOUBLES_EQUAL(2.0,resField->getArray()->getIJ(i,0),1e-12);
       for(int i=4;i<8;i++)
@@ -660,7 +660,7 @@ void ParaMEDMEMTest::testOverlapDEC4()
   MEDCouplingFieldDouble * resField = parafieldT->getField();
   if(rank==0)
     {
-      CPPUNIT_ASSERT_EQUAL(8, resField->getNumberOfTuples());
+      CPPUNIT_ASSERT_EQUAL(8, (int)resField->getNumberOfTuples());
       for(int i=0;i<4;i++)
         {
           CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,resField->getArray()->getIJ(i*2,0),1e-12);
@@ -674,7 +674,7 @@ void ParaMEDMEMTest::testOverlapDEC4()
     }
   if(rank==1)
     {
-      CPPUNIT_ASSERT_EQUAL(12, resField->getNumberOfTuples());
+      CPPUNIT_ASSERT_EQUAL(12, (int)resField->getNumberOfTuples());
       for(int i=0;i<4;i++)
         {
           CPPUNIT_ASSERT_DOUBLES_EQUAL(2.0,resField->getArray()->getIJ(i*2,0),1e-12);