Changeset 1147 for XIOS/dev/branch_yushan_merged/extern/remap/src/mapper.cpp

Timestamp:

05/29/17 16:15:38 (7 years ago)

Author:

yushan

Message:

bug fixed in MPI_Gather(v)

File:

• XIOS/dev/branch_yushan_merged/extern/remap/src/mapper.cpp (modified) (6 diffs)

XIOS/dev/branch_yushan_merged/extern/remap/src/mapper.cpp

@@ -21 +21 @@
 void cptOffsetsFromLengths(const int *lengths, int *offsets, int sz)
 {
-        offsets[0] = 0;
-        for (int i = 1; i < sz; i++)
-                offsets[i] = offsets[i-1] + lengths[i-1];
+  offsets[0] = 0;
+  for (int i = 1; i < sz; i++)
+    offsets[i] = offsets[i-1] + lengths[i-1];
 }
 
@@ -31 +31 @@
   srcGrid.pole = Coord(pole[0], pole[1], pole[2]);
 
-        int mpiRank, mpiSize;
-        MPI_Comm_rank(communicator, &mpiRank);
-        MPI_Comm_size(communicator, &mpiSize);
-
-        sourceElements.reserve(nbCells);
-        sourceMesh.reserve(nbCells);
+  int mpiRank, mpiSize;
+  MPI_Comm_rank(communicator, &mpiRank);
+  MPI_Comm_size(communicator, &mpiSize);
+
+  sourceElements.reserve(nbCells);
+  sourceMesh.reserve(nbCells);
   sourceGlobalId.resize(nbCells) ;
 
@@ -49 +49 @@
   else sourceGlobalId.assign(globalId,globalId+nbCells);
 
-        for (int i = 0; i < nbCells; i++)
-        {
-                int offs = i*nVertex;
-                Elt elt(boundsLon + offs, boundsLat + offs, nVertex);
-                elt.src_id.rank = mpiRank;
-                elt.src_id.ind = i;
+  for (int i = 0; i < nbCells; i++)
+  {
+    int offs = i*nVertex;
+    Elt elt(boundsLon + offs, boundsLat + offs, nVertex);
+    elt.src_id.rank = mpiRank;
+    elt.src_id.ind = i;
     elt.src_id.globalId = sourceGlobalId[i];
-                sourceElements.push_back(elt);
-                sourceMesh.push_back(Node(elt.x, cptRadius(elt), &sourceElements.back()));
-                cptEltGeom(sourceElements[i], Coord(pole[0], pole[1], pole[2]));
-        }
+    sourceElements.push_back(elt);
+    sourceMesh.push_back(Node(elt.x, cptRadius(elt), &sourceElements.back()));
+    cptEltGeom(sourceElements[i], Coord(pole[0], pole[1], pole[2]));
+  }
 
 }
@@ -485 +485 @@
     mpiRoute.init(routes);
     int nRecv = mpiRoute.getTotalSourceElement();
-    // cout << mpiRank << " NRECV " << nRecv << "(" << routes.size() << ")"<< endl;
 
     int *nbSendNode = new int[mpiSize];
@@ -879 +878 @@
         {
             MPI_Issend(sendBuffer2[rank], sentMessageSize[rank], MPI_CHAR, rank, 0, communicator, &sendRequest[nbSendRequest]);
+            printf("proc %d send %d elements to proc %d\n", mpiRank, sentMessageSize[rank], rank);
             nbSendRequest++;
         }
@@ -884 +884 @@
         {
             MPI_Irecv(recvBuffer2[rank], recvMessageSize[rank], MPI_CHAR, rank, 0, communicator, &recvRequest[nbRecvRequest]);
+            printf("proc %d recv %d elements from proc %d\n", mpiRank, recvMessageSize[rank], rank);
             nbRecvRequest++;
         }