From: cvw <cvw>
Date: Tue, 27 Mar 2012 13:39:20 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V6_main_FINAL~712
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1a750d168658a561094dfe506ebfb19b7eff7379;p=tools%2Fmedcoupling.git

*** empty log message ***
---

diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx
index 94395d75d..82254607e 100644
--- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx
@@ -107,7 +107,7 @@ void ParallelTopology::setGlobalNumerotationDefault(ParaDomainSelector* domainSe
         }
     }
 #ifdef HAVE_MPI2
-  if (MyGlobals::_Verbose>500) MPI_Barrier(MPI_COMM_WORLD); //synchronize verbose trace
+  if (MyGlobals::_Verbose>500 && MyGlobals::_World_Size>1) MPI_Barrier(MPI_COMM_WORLD); //synchronize verbose trace
 #endif
   if (MyGlobals::_Is0verbose>500) std::cout << std::endl;
   
@@ -126,7 +126,7 @@ void ParallelTopology::setGlobalNumerotationDefault(ParaDomainSelector* domainSe
         }
     }
 #ifdef HAVE_MPI2
-  if (MyGlobals::_Verbose>500) MPI_Barrier(MPI_COMM_WORLD); //synchronize verbose trace
+  if (MyGlobals::_Verbose>500 && MyGlobals::_World_Size>1) MPI_Barrier(MPI_COMM_WORLD); //synchronize verbose trace
 #endif
   if (MyGlobals::_Is0verbose>500) std::cout << std::endl;
   
@@ -299,7 +299,7 @@ ParallelTopology::ParallelTopology(Graph* graph, Topology* oldTopology, int nb_d
   for (int iold=0; iold<oldTopology->nbDomain(); iold++)
     {
       int ioldNbCell=oldTopology->getCellNumber(iold);
-      //cout<<"proc "<<MyGlobals::_Rank<<" : cell number old domain "<<iold<<" : "<<ioldNbCell<<endl;
+      //std::cout<<"proc "<<MyGlobals::_Rank<<" : cell number old domain "<<iold<<" : "<<ioldNbCell<<std::endl;
       //if not my old domains getCellNumber is 0
       std::vector<int> globalids(ioldNbCell);
       oldTopology->getCellList(iold, &globalids[0]); //unique global numerotation
diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx
index 4e7539d07..19a29ead3 100644
--- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx
@@ -20,8 +20,6 @@
 #ifndef __MEDPARTITIONER_PARALLELTOPOLOGY_HXX__
 #define __MEDPARTITIONER_PARALLELTOPOLOGY_HXX__
 
-#include "MEDPARTITIONER.hxx"
-
 #include "MEDPARTITIONER_Topology.hxx"
 #include "MEDPARTITIONER_ParaDomainSelector.hxx"
 
diff --git a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx
index c67076599..fc1583aa8 100644
--- a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx
@@ -29,7 +29,7 @@ namespace MEDPARTITIONER
 {
   class SkyLineArray;
   class ParaDomainSelector;
-  class MEDPARTITIONER_EXPORT MEDPARTITIONER_EXPORT UserGraph : public Graph
+  class MEDPARTITIONER_EXPORT UserGraph : public Graph
   {
   public:
     UserGraph(MEDPARTITIONER::SkyLineArray*, const int*, int);
diff --git a/src/MEDPartitioner/MEDPARTITIONER_UtilsPara.cxx b/src/MEDPartitioner/MEDPARTITIONER_UtilsPara.cxx
index e52f30260..fa63df8ba 100644
--- a/src/MEDPartitioner/MEDPARTITIONER_UtilsPara.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_UtilsPara.cxx
@@ -76,6 +76,9 @@ std::vector<std::string> MEDPARTITIONER::SendAndReceiveVectorOfString(const std:
  */
 std::vector<std::string> MEDPARTITIONER::AllgathervVectorOfString(const std::vector<std::string>& vec)
 {
+  if (MyGlobals::_World_Size==1) //nothing to do
+    return vec;
+
   int world_size=MyGlobals::_World_Size;
   std::string str=SerializeFromVectorOfString(vec);