Ignore:
Timestamp:
05/16/17 17:54:30 (7 years ago)
Author:
yushan
Message:

branch merged with trunk r1130

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan_merged/src/timer.hpp

    r688 r1134  
    2121      double getCumulatedTime(void); 
    2222      static std::map<std::string,CTimer> allTimer; 
     23 
     24      static std::map<std::string,CTimer> *allTimer_ptr; 
     25      #pragma omp threadprivate(allTimer_ptr) 
     26       
    2327      static double getTime(void); 
    2428      static CTimer& get(std::string name); 
Note: See TracChangeset for help on using the changeset viewer.