Changeset 1601 for XIOS/dev/dev_trunk_omp/src/node/axis.hpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/node/axis.hpp (modified) (4 diffs)

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

@@ -16 +16 @@
 #include "transformation.hpp"
 #include "transformation_enum.hpp"
+
+#include "mpi_std.hpp"
 
 namespace xios {
@@ -68 +70 @@
          const std::set<StdString> & getRelFiles(void) const;
 
-         int getNumberWrittenIndexes(MPI_Comm writtenCom);
-         int getTotalNumberWrittenIndexes(MPI_Comm writtenCom);
-         int getOffsetWrittenIndexes(MPI_Comm writtenCom);
-         CArray<int, 1>& getCompressedIndexToWriteOnServer(MPI_Comm writtenCom);
+         int getNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom);
+         int getTotalNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom);
+         int getOffsetWrittenIndexes(ep_lib::MPI_Comm writtenCom);
+         CArray<int, 1>& getCompressedIndexToWriteOnServer(ep_lib::MPI_Comm writtenCom);
 
          std::map<int, StdSize> getAttributesBufferSize(CContextClient* client, const std::vector<int>& globalDim, int orderPositionInGrid,
@@ -113 +115 @@
 
          void computeWrittenIndex();
-         void computeWrittenCompressedIndex(MPI_Comm);
+         void computeWrittenCompressedIndex(ep_lib::MPI_Comm);
          bool hasTransformation();
          void solveInheritanceTransformation();
@@ -177 +179 @@
        private:
          static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m);
-         static std::map<StdString, ETranformationType> transformationMapList_;
-         static bool dummyTransformationMapList_;
+         static bool initializeTransformationMap();
+         static std::map<StdString, ETranformationType> *transformationMapList_ptr;
+         #pragma omp threadprivate(transformationMapList_ptr)
+         //static bool dummyTransformationMapList_;
 
          DECLARE_REF_FUNC(Axis,axis)