Changeset 1661 for XIOS/dev/dev_trunk_omp/extern/remap/src/timerRemap.cpp

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.

File:

• XIOS/dev/dev_trunk_omp/extern/remap/src/timerRemap.cpp (modified) (2 diffs)

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);