Changeset 1103 for XIOS/dev/branch_yushan/src/transformation/Functions

Timestamp:

04/21/17 17:39:29 (7 years ago)

Author:

yushan

Message:

save modif. Todo: axis, domain, mesh, scalar, transformation

Location:

XIOS/dev/branch_yushan/src/transformation/Functions

Files:

• reduction.cpp (modified) (1 diff)
• reduction.hpp (modified) (3 diffs)

XIOS/dev/branch_yushan/src/transformation/Functions/reduction.cpp

@@ -9 +9 @@
 
 CReductionAlgorithm::CallBackMap* CReductionAlgorithm::reductionCreationCallBacks_ = 0;
-std::map<StdString,EReductionType> CReductionAlgorithm::ReductionOperations = std::map<StdString,EReductionType>();
-bool CReductionAlgorithm::initReductionOperation(std::map<StdString,EReductionType>& m)
+//std::map<StdString,EReductionType> CReductionAlgorithm::ReductionOperations = std::map<StdString,EReductionType>();
+std::map<StdString,EReductionType> *CReductionAlgorithm::ReductionOperations_ptr = 0; 
+
+// bool CReductionAlgorithm::initReductionOperation(std::map<StdString,EReductionType>& m)
+// {
+//   // So so stupid way to intialize operation but it works ...
+//   m["sum"] = TRANS_REDUCE_SUM;
+//   CSumReductionAlgorithm::registerTrans();
+
+//   m["min"] = TRANS_REDUCE_MIN;
+//   CMinReductionAlgorithm::registerTrans();
+
+//   m["max"] = TRANS_REDUCE_MAX;
+//   CMaxReductionAlgorithm::registerTrans();
+
+//   m["extract"] = TRANS_REDUCE_EXTRACT;
+//   CExtractReductionAlgorithm::registerTrans();
+
+//   m["average"] = TRANS_REDUCE_AVERAGE;
+//   CAverageReductionAlgorithm::registerTrans();
+// }
+
+bool CReductionAlgorithm::initReductionOperation(std::map<StdString,EReductionType>* m)
 {
+  if(m==NULL) m=new std::map<StdString,EReductionType>();
   // So so stupid way to intialize operation but it works ...
-  m["sum"] = TRANS_REDUCE_SUM;
+  (*m)["sum"] = TRANS_REDUCE_SUM;
   CSumReductionAlgorithm::registerTrans();
 
-  m["min"] = TRANS_REDUCE_MIN;
+  (*m)["min"] = TRANS_REDUCE_MIN;
   CMinReductionAlgorithm::registerTrans();
 
-  m["max"] = TRANS_REDUCE_MAX;
+  (*m)["max"] = TRANS_REDUCE_MAX;
   CMaxReductionAlgorithm::registerTrans();
 
-  m["extract"] = TRANS_REDUCE_EXTRACT;
+  (*m)["extract"] = TRANS_REDUCE_EXTRACT;
   CExtractReductionAlgorithm::registerTrans();
 
-  m["average"] = TRANS_REDUCE_AVERAGE;
+  (*m)["average"] = TRANS_REDUCE_AVERAGE;
   CAverageReductionAlgorithm::registerTrans();
 }
 
-bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation(CReductionAlgorithm::ReductionOperations);
+//bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation(CReductionAlgorithm::ReductionOperations);
+bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation(CReductionAlgorithm::ReductionOperations_ptr);
 
 CReductionAlgorithm* CReductionAlgorithm::createOperation(EReductionType reduceType)
 {
   int reduceTypeInt = reduceType;
+  if (0 == reductionCreationCallBacks_)
+    reductionCreationCallBacks_ = new CallBackMap();
+
   CallBackMap::const_iterator it = (*reductionCreationCallBacks_).find(reduceType);
   if ((*reductionCreationCallBacks_).end() == it)

XIOS/dev/branch_yushan/src/transformation/Functions/reduction.hpp

@@ -23 +23 @@
 {
 public:
-  static std::map<StdString,EReductionType> ReductionOperations;
+  //static std::map<StdString,EReductionType> ReductionOperations;
+  static std::map<StdString,EReductionType> *ReductionOperations_ptr;
+  #pragma omp threadprivate(ReductionOperations_ptr)
 
 public:
@@ -59 +61 @@
   typedef std::map<EReductionType, CreateOperationCallBack> CallBackMap;
   static CallBackMap* reductionCreationCallBacks_;
-  //#pragma omp threadprivate(reductionCreationCallBacks_)
+  #pragma omp threadprivate(reductionCreationCallBacks_)
 
   static bool registerOperation(EReductionType reduceType, CreateOperationCallBack createFn);
@@ -65 +67 @@
 
 protected:
-  static bool initReductionOperation(std::map<StdString,EReductionType>& m);
+  //static bool initReductionOperation(std::map<StdString,EReductionType>& m);
+  static bool initReductionOperation(std::map<StdString,EReductionType>* m);
   static bool _dummyInit;
-  //#pragma omp threadprivate(_dummyInit)
+  #pragma omp threadprivate(_dummyInit)
 };