Changeset 1134 for XIOS/dev/branch_yushan_merged/src/node/axis.hpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/node/axis.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/node/axis.hpp

@@ -169 +169 @@
        private:
          static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m);
-         static std::map<StdString, ETranformationType> transformationMapList_;
-         static bool dummyTransformationMapList_;
+         //static bool initializeTransformationMap(std::map<StdString, ETranformationType>* m);
+         static bool initializeTransformationMap();
+
+         //static std::map<StdString, ETranformationType> transformationMapList_;
+         
+         static std::map<StdString, ETranformationType> *transformationMapList_ptr;
+         #pragma omp threadprivate(transformationMapList_ptr)
+
+         //static bool dummyTransformationMapList_;
+         //#pragma omp threadprivate(dummyTransformationMapList_)
 
          DECLARE_REF_FUNC(Axis,axis)
@@ -182 +190 @@
 
 #endif // __XIOS_CAxis__
+