Changeset 1642 for XIOS/dev/branch_openmp/extern/remap/src/timerRemap.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/extern/remap/src/timerRemap.cpp (modified) (3 diffs)

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

@@ -4 +4 @@
 #include <map>
 #include <iostream>
-using namespace ep_lib;
 
 namespace sphereRemap {
@@ -10 +9 @@
 using namespace std;
 
-//map<string,CTimer*> CTimer::allTimer;
-map<string,CTimer*> *CTimer::allTimer_ptr = 0;
+map<string,CTimer*> CTimer::allTimer;
 
 CTimer::CTimer(const string& name_) : name(name_)
@@ -58 +56 @@
 {
         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;
+        it=allTimer.find(name);
+        if (it==allTimer.end()) it=allTimer.insert(pair<string,CTimer*>(name,new CTimer(name))).first;
         return *(it->second);
 }