Changeset 1661 for XIOS/dev/dev_trunk_omp/extern/remap/src

Timestamp:

05/15/19 17:19:08 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1660. Test (test_complete, test_remap) on ADA with IntelMPI and _usingEP/_usingMPI as switch.

Location:

XIOS/dev/dev_trunk_omp/extern/remap/src

Files:

• mpi_routing.cpp (modified) (2 diffs)
• timerRemap.cpp (modified) (2 diffs)
• timerRemap.hpp (modified) (1 diff)

XIOS/dev/dev_trunk_omp/extern/remap/src/mpi_routing.cpp

@@ -153 +153 @@
         for (int i = 0; i < nbSource; i++)
         {
+                #ifdef _usingEP
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest++]);
+                #endif
+                
+                #ifdef _usingMPI
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest++]);
+                #endif
         }
         MPI_Barrier(communicator);
@@ -171 +177 @@
         for (int i = 0; i < nbSource; i++)
         {
+#ifdef _usingEP
                 MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest]);
+#endif
+#ifdef _usingMPI
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
+#endif
                 indexRequest++;
         }

XIOS/dev/dev_trunk_omp/extern/remap/src/timerRemap.cpp

@@ -12 +12 @@
 using namespace std;
 
-//map<string,CTimer*> CTimer::allTimer;
 map<string,CTimer*> *CTimer::allTimer_ptr = 0;
 
@@ -61 +60 @@
         map<string,CTimer*>::iterator it;
         if(allTimer_ptr == 0) allTimer_ptr = new map<string,CTimer*>;
-        //it=allTimer.find(name);
         it=allTimer_ptr->find(name);
-        //if (it==allTimer.end()) it=allTimer.insert(pair<string,CTimer*>(name,new CTimer(name))).first;
         if (it==allTimer_ptr->end()) it=allTimer_ptr->insert(pair<string,CTimer*>(name,new CTimer(name))).first;
         return *(it->second);

XIOS/dev/dev_trunk_omp/extern/remap/src/timerRemap.hpp

@@ -26 +26 @@
     double getCumulatedTime(void);
     void print(void);
-    //static map<string,CTimer*> allTimer;
     static map<string,CTimer*> *allTimer_ptr;
     #pragma omp threadprivate(allTimer_ptr)