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

Timestamp:

11/19/18 16:28:03 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

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

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

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