Changeset 1328 for XIOS/dev/branch_openmp/src/transformation/Functions/reduction.hpp

Timestamp:

11/15/17 12:14:34 (7 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/src/transformation/Functions/reduction.hpp (modified) (5 diffs)

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

@@ -25 +25 @@
   //static std::map<StdString,EReductionType> ReductionOperations;
   static std::map<StdString,EReductionType> *ReductionOperations_ptr;
-  #pragma omp threadprivate(ReductionOperations_ptr)
 
 public:
-  CReductionAlgorithm() { }
+  CReductionAlgorithm() {}
 
   /*!
@@ -43 +42 @@
     \param [in/out] dataOut Array contains local data
     \param [in/out] flagInitial vector of boolean to mark the local index already initialized. True means there is a need for initialization
+    \param [in] firstPass indicate if it is the first time the apply funtion is called for a same transformation, in order to make a clean initialization 
   */
   virtual void apply(const std::vector<std::pair<int,double> >& localIndex,
@@ -48 +48 @@
                      CArray<double,1>& dataOut,
                      std::vector<bool>& flagInitial,                     
-                     bool ignoreMissingValue) = 0;
+                     bool ignoreMissingValue, bool firstPass) = 0;
   /*!
     Update local data 
@@ -62 +62 @@
   typedef std::map<EReductionType, CreateOperationCallBack> CallBackMap;
   static CallBackMap* reductionCreationCallBacks_;
-  #pragma omp threadprivate(reductionCreationCallBacks_)
 
   static bool registerOperation(EReductionType reduceType, CreateOperationCallBack createFn);
@@ -71 +70 @@
   static bool initReductionOperation();
   static bool _dummyInit;
-  #pragma omp threadprivate(_dummyInit)
 };