From: Anthony Geay <anthony.geay@edf.fr>
Date: Sat, 18 Apr 2020 07:23:40 +0000 (+0200)
Subject: WIP
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f24946d0e9800b47e69e3362762b910326467196;p=tools%2Fmedcoupling.git

WIP
---

diff --git a/src/MEDCoupling/MCAuto.hxx b/src/MEDCoupling/MCAuto.hxx
index 1d47b7f67..6ef2fab78 100644
--- a/src/MEDCoupling/MCAuto.hxx
+++ b/src/MEDCoupling/MCAuto.hxx
@@ -24,6 +24,7 @@
 #include "InterpKernelException.hxx"
 
 #include <vector>
+#include <algorithm>
 
 namespace MEDCoupling
 {
@@ -60,6 +61,16 @@ namespace MEDCoupling
     T *_ptr;
   };
 
+  template<class T>
+  std::vector<const T*> FromVecAutoToVecOfConst(const std::vector<MCAuto<T>>& inputVec)
+  {
+    std::size_t size(inputVec.size());
+    std::vector< const T *> ret(size);
+    typename std::vector< const T *>::iterator itArrays(ret.begin());
+    std::for_each(inputVec.begin(),inputVec.end(),[&itArrays](MCAuto<T> elt) { *itArrays++=elt; });
+    return ret;
+  }
+
   template<class T, class U>
   typename MEDCoupling::MCAuto<U> DynamicCast(typename MEDCoupling::MCAuto<T>& autoSubPtr) throw()
   {
diff --git a/src/ParaMEDMEM/CommInterface.cxx b/src/ParaMEDMEM/CommInterface.cxx
index 96c85fd9e..eaab8af02 100644
--- a/src/ParaMEDMEM/CommInterface.cxx
+++ b/src/ParaMEDMEM/CommInterface.cxx
@@ -86,11 +86,8 @@ namespace MEDCoupling
     this->commSize(comm,&size);
     if( arrays.size() != ToSizeT(size) )
       throw INTERP_KERNEL::Exception("AllToAllArrays : internal error ! Invalid size of input array.");
-    std::vector< const DataArrayIdType *> arraysBis(size);
-    {
-      std::vector< const DataArrayIdType *>::iterator itArraysBis(arraysBis.begin());
-      std::for_each(arrays.begin(),arrays.end(),[&itArraysBis](MCAuto<DataArrayIdType> elt) { *itArraysBis++=elt; });
-    }
+      
+    std::vector< const DataArrayIdType *> arraysBis(FromVecAutoToVecOfConst<DataArrayIdType>(arrays));
     std::unique_ptr<mcIdType[]> nbOfElems2(new mcIdType[size]),nbOfElems3(new mcIdType[size]);
     for(int curRk = 0 ; curRk < size ; ++curRk)
     {
diff --git a/src/ParaMEDMEM/ParaSkyLineArray.cxx b/src/ParaMEDMEM/ParaSkyLineArray.cxx
index fc88c3807..a7f0d22b9 100644
--- a/src/ParaMEDMEM/ParaSkyLineArray.cxx
+++ b/src/ParaMEDMEM/ParaSkyLineArray.cxx
@@ -77,15 +77,22 @@ MCAuto<ParaSkyLineArray> ParaSkyLineArray::equiRedistribute(mcIdType nbOfEntitie
     }
   }
   // communication : 3 arrays are going to be all2allized : ids, SkyLine index and SyLine values
-  std::vector< MCAuto<DataArrayIdType> > myRkIdsCaptured, myRkSkIndex, myRkSkValues;
-  ci.allToAllArrays(comm,idsCaptured,myRkIdsCaptured);
+  MCAuto<DataArrayIdType> aggregatedIds,indices,values;
   {
+    std::vector< MCAuto<DataArrayIdType> > myRkIdsCaptured;
+    ci.allToAllArrays(comm,idsCaptured,myRkIdsCaptured);
+    aggregatedIds = DataArrayIdType::Aggregate(FromVecAutoToVecOfConst<DataArrayIdType>(myRkIdsCaptured));
+  }
+  {
+    std::vector< MCAuto<DataArrayIdType> > myRkSkIndex;
     std::vector< MCAuto<DataArrayIdType> > indexToBeSent(MEDCouplingSkyLineArray::RetrieveVecIndex(skToBeSent));
     ci.allToAllArrays(comm,indexToBeSent,myRkSkIndex);
+    indices = DataArrayIdType::AggregateIndexes(FromVecAutoToVecOfConst<DataArrayIdType>(myRkSkIndex));
   }
   {
+    std::vector< MCAuto<DataArrayIdType> > myRkSkValues;
     std::vector< MCAuto<DataArrayIdType> > valuesToBeSent(MEDCouplingSkyLineArray::RetrieveVecValues(skToBeSent));
     ci.allToAllArrays(comm,valuesToBeSent,myRkSkValues);
+    values = DataArrayIdType::Aggregate(FromVecAutoToVecOfConst<DataArrayIdType>(myRkSkValues));
   }
-  // assemble the 3 arrays myRkIdsCaptured, myRkSkIndex, myRkSkValues
 }
\ No newline at end of file