Changeset 422:91f0799329d5

Timestamp:

11/12/2012 09:20:30 PM (7 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Message:

adding dirty interim wrapper for MPI_Gatherv()

Location:

src

Files:

• io/bovwriter.h (modified) (1 diff)
• io/parallelwriter.h (modified) (1 diff)
• mpilayer/mpilayer.h (modified) (2 diffs)

src/io/bovwriter.h

@@ -19 +19 @@
 template<typename CELL_TYPE, typename SELECTOR_TYPE>
 class BOVWriter : public ParallelWriter<CELL_TYPE>
-{    
+{
 public:
     friend class BOVWriterTest;

src/io/parallelwriter.h

@@ -35 +35 @@
         const std::string& _prefix, 
         DistributedSimulator<CELL_TYPE> *_distSim, 
-        const unsigned& _period = 1): 
+        const unsigned& _period = 1) : 
         prefix(_prefix), distSim(_distSim), period(_period)
     {

src/mpilayer/mpilayer.h

@@ -324 +324 @@
         SuperVector<int> displacements(size());
         displacements[0] = 0;
-        for (int i = 0; i < size() - 1; ++i)
+        for (int i = 0; i < size() - 1; ++i) {
             displacements[i + 1] = displacements[i] + lengths[i];
+        }
         comm->Allgatherv(source, lengths[rank()], datatype, &(target->front()), &(lengths.front()), &(displacements.front()), datatype);
     }
@@ -342 +343 @@
             return SuperVector<T>();
         }
+    }
+
+    // fixme: needs test
+    template<typename T>
+    inline void gatherV(
+        const T *source, 
+        const int num,
+        const SuperVector<int>& lengths,
+        const unsigned& root, 
+        SuperVector<T> *target, 
+        const MPI::Datatype& datatype = Typemaps::lookup<T>()) const
+    {
+        SuperVector<int> displacements(size());
+        if (rank() == root) {
+            displacements[0] = 0;
+            for (int i = 0; i < size() - 1; ++i) {
+                displacements[i + 1] = displacements[i] + lengths[i];
+            }
+        }
+
+        // std::cout << "num[" << rank() << "]: " << num << "\n";
+        // std::cout << "lengths[" << rank() << "]: " << lengths << "\n";
+        // std::cout << "displacements[" << rank() << "]: " << displacements << "\n";
+        // std::cout << "targetsize[" << rank() << "]: " << target->size() << "\n";
+
+        comm->Gatherv(source, num, datatype, 
+                      &(*target)[0], &lengths[0], &displacements[0], datatype, 
+                      root);
     }