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/transformation/Functions/reduction.hpp

    r1076 r1134  
    2323{ 
    2424public: 
    25   static std::map<StdString,EReductionType> ReductionOperations; 
     25  //static std::map<StdString,EReductionType> ReductionOperations; 
     26  static std::map<StdString,EReductionType> *ReductionOperations_ptr; 
     27  #pragma omp threadprivate(ReductionOperations_ptr) 
    2628 
    2729public: 
     
    6062  typedef std::map<EReductionType, CreateOperationCallBack> CallBackMap; 
    6163  static CallBackMap* reductionCreationCallBacks_; 
     64  #pragma omp threadprivate(reductionCreationCallBacks_) 
    6265 
    6366  static bool registerOperation(EReductionType reduceType, CreateOperationCallBack createFn); 
     
    6669protected: 
    6770  static bool initReductionOperation(std::map<StdString,EReductionType>& m); 
     71  static bool initReductionOperation(); 
    6872  static bool _dummyInit; 
     73  #pragma omp threadprivate(_dummyInit) 
    6974}; 
    7075 
Note: See TracChangeset for help on using the changeset viewer.