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

Timestamp:

07/10/17 18:17:04 (7 years ago)

Author:

yushan

Message:

branch merged with trunk @1200

File:

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

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

@@ -15 +15 @@
 namespace sphereRemap {
 
-extern CRemapGrid srcGrid;
-#pragma omp threadprivate(srcGrid)
-
-extern CRemapGrid tgtGrid;
-#pragma omp threadprivate(tgtGrid)
-
 /* A subdivition of an array into N sub-arays
    can be represented by the length of the N arrays
@@ -275 +269 @@
 
     MPI_Status *status = new MPI_Status[4*mpiSize];
-    
+
+    MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
-    MPI_Waitall(nbSendRequest, sendRequest, status);
-    
 
     /* for all indices that have been received from requesting ranks: pack values and gradients, then send */
@@ -629 +622 @@
     MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
- 
+
     int nbNeighbourNodes = 0;
     for (int rank = 0; rank < mpiSize; rank++)
@@ -699 +692 @@
         }
 
-        /*
-           for (int i = 0; i < elt->n; i++)
-           {
-           if (elt->neighbour[i] == NOT_FOUND)
-           error_exit("neighbour not found");
-           }
-           */
     }
 }
@@ -810 +796 @@
         }
     }
- 
+
     MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-    
-    
+
     char **sendBuffer2 = new char*[mpiSize];
     char **recvBuffer2 = new char*[mpiSize];
@@ -838 +823 @@
                     Elt *elt2 = (Elt *) ((*it)->data);
                     /* recvElt is target, elt2 is source */
-                    //                                  intersect(&recvElt[j], elt2);
-                    intersect_ym(&recvElt[j], elt2);
+                    intersect(&recvElt[j], elt2);
+                    //intersect_ym(&recvElt[j], elt2);
                 }
-
                 if (recvElt[j].is.size() > 0) sentMessageSize[rank] += packIntersectionSize(recvElt[j]);
 
@@ -860 +844 @@
             }
             delete [] recvElt;
-
         }
     }
@@ -898 +881 @@
     MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-   
-   
 
     delete [] sendRequest;