X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FParaMEDMEMTest%2FParaMEDMEMTest_ICoco.cxx;h=2650ce9ef296c798711f223db9491d32e20c01ea;hb=4c22ba01f2901896d1ec9ca302640f4d7e50d147;hp=480c0d54f0b003a79e8731b5aebb37b700593939;hpb=5da72d398d0eb1820c3ce6dd90b8579b6b14edf5;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx index 480c0d54f..2650ce9ef 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.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 @@ -45,7 +45,7 @@ void synchronize_bool(bool& stop, synctype s) int my_stop_temp = stop?1:0; if (s==sync_and) MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MIN,MPI_COMM_WORLD); - else if (s==sync_or) + else // if (s==sync_or) MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD); stop =(my_stop==1); } @@ -72,7 +72,7 @@ MEDCouplingUMesh *init_quad() const double dataCoo[24]={0.,0.,0.,1.,0.,0.,0.,0.,1.,1.,0.,1.,0.,1e-05,0.,1.,1e-05,0.,0.,1e-05,1.,1.,1e-05,1.}; coo->alloc(8,3); std::copy(dataCoo,dataCoo+24,coo->getPointer()); - const int conn[8]={0,1,3,2,4,5,7,6}; + const mcIdType conn[8]={0,1,3,2,4,5,7,6}; m->allocateCells(2); m->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn); m->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+4); @@ -87,7 +87,7 @@ MEDCouplingUMesh *init_triangle() const double dataCoo[24]={0.,0.,0.,1.,0.,0.,0.,0.,1.,1.,0.,1.,0.,1e-05,0.,1.,1e-05,0.,0.,1e-05,1.,1.,1e-05,1.}; coo->alloc(8,3); std::copy(dataCoo,dataCoo+24,coo->getPointer()); - const int conn[12]={0,1,2,1,2,3,4,5,7,4,6,7}; + const mcIdType conn[12]={0,1,2,1,2,3,4,5,7,4,6,7}; m->allocateCells(4); for(int i=0;i<4;i++) m->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+3*i); @@ -144,7 +144,6 @@ void ParaMEDMEMTest::testICoco1() champ_recepteur->setOwnSupport(true); } - MPI_Barrier(MPI_COMM_WORLD); clock_t clock0(clock());