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

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.cpp (modified) (11 diffs)

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

@@ -14 +14 @@
 #include "distribution_client.hpp"
 
+using namespace ep_lib;
+
 namespace xios {
 
@@ -26 +28 @@
       , transformationMap_(), hasValue(false), hasLabel(false)
       , computedWrittenIndex_(false)
-          , clients()
+      , clients()
    {
    }
@@ -38 +40 @@
       , transformationMap_(), hasValue(false), hasLabel(false)
       , computedWrittenIndex_(false)
-          , clients()
+      , clients()
    {
    }
@@ -45 +47 @@
    { /* Ne rien faire de plus */ }
 
-   std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>();
-   bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_);
+   std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0;
+
    bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
    {
@@ -58 +60 @@
      m["temporal_splitting"] = TRANS_TEMPORAL_SPLITTING;
      m["duplicate_scalar"] = TRANS_DUPLICATE_SCALAR_TO_AXIS;
-
+   }
+
+   bool CAxis::initializeTransformationMap()
+   {
+     if(CAxis::transformationMapList_ptr == 0) CAxis::transformationMapList_ptr = new std::map<StdString, ETranformationType>();
+     (*CAxis::transformationMapList_ptr)["zoom_axis"]        = TRANS_ZOOM_AXIS;
+     (*CAxis::transformationMapList_ptr)["interpolate_axis"] = TRANS_INTERPOLATE_AXIS;
+     (*CAxis::transformationMapList_ptr)["extract_axis"]     = TRANS_EXTRACT_AXIS;
+     (*CAxis::transformationMapList_ptr)["inverse_axis"]     = TRANS_INVERSE_AXIS;
+     (*CAxis::transformationMapList_ptr)["reduce_domain"]    = TRANS_REDUCE_DOMAIN_TO_AXIS;
+     (*CAxis::transformationMapList_ptr)["extract_domain"]   = TRANS_EXTRACT_DOMAIN_TO_AXIS;
+     (*CAxis::transformationMapList_ptr)["reduce_axis"]      = TRANS_REDUCE_AXIS_TO_AXIS;
+     (*CAxis::transformationMapList_ptr)["temporal_splitting"] = TRANS_TEMPORAL_SPLITTING;
+     (*CAxis::transformationMapList_ptr)["duplicate_scalar"] = TRANS_DUPLICATE_SCALAR_TO_AXIS;
    }
 
@@ -114 +129 @@
      \return the number of indexes written by each server
    */
-   int CAxis::getNumberWrittenIndexes(MPI_Comm writtenCom)
+   int CAxis::getNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return numberWrittenIndexes_[writtenSize];
    }
@@ -125 +140 @@
      \return the total number of indexes written by the servers
    */
-   int CAxis::getTotalNumberWrittenIndexes(MPI_Comm writtenCom)
+   int CAxis::getTotalNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return totalNumberWrittenIndexes_[writtenSize];
    }
@@ -136 +151 @@
      \return the offset of indexes written by each server
    */
-   int CAxis::getOffsetWrittenIndexes(MPI_Comm writtenCom)
+   int CAxis::getOffsetWrittenIndexes(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return offsetWrittenIndexes_[writtenSize];
    }
 
-   CArray<int, 1>& CAxis::getCompressedIndexToWriteOnServer(MPI_Comm writtenCom)
+   CArray<int, 1>& CAxis::getCompressedIndexToWriteOnServer(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return compressedIndexToWriteOnServer[writtenSize];
    }
@@ -689 +704 @@
   }
 
-  void CAxis::computeWrittenCompressedIndex(MPI_Comm writtenComm)
+  void CAxis::computeWrittenCompressedIndex(ep_lib::MPI_Comm writtenComm)
   {
     int writtenCommSize;
-    MPI_Comm_size(writtenComm, &writtenCommSize);
+    ep_lib::MPI_Comm_size(writtenComm, &writtenCommSize);
     if (compressedIndexToWriteOnServer.find(writtenCommSize) != compressedIndexToWriteOnServer.end())
       return;
@@ -750 +765 @@
       {
              
-        MPI_Allreduce(&numberWrittenIndexes_[writtenCommSize], &totalNumberWrittenIndexes_[writtenCommSize], 1, MPI_INT, MPI_SUM, writtenComm);
-        MPI_Scan(&numberWrittenIndexes_[writtenCommSize], &offsetWrittenIndexes_[writtenCommSize], 1, MPI_INT, MPI_SUM, writtenComm);
+        ep_lib::MPI_Allreduce(&numberWrittenIndexes_[writtenCommSize], &totalNumberWrittenIndexes_[writtenCommSize], 1, MPI_INT, MPI_SUM, writtenComm);
+        ep_lib::MPI_Scan(&numberWrittenIndexes_[writtenCommSize], &offsetWrittenIndexes_[writtenCommSize], 1, MPI_INT, MPI_SUM, writtenComm);
         offsetWrittenIndexes_[writtenCommSize] -= numberWrittenIndexes_[writtenCommSize];
       }
@@ -1346 +1361 @@
 
         nodeElementName = node.getElementName();
-        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it;
-        it = transformationMapList_.find(nodeElementName);
+
+        if(transformationMapList_ptr == 0) initializeTransformationMap();
+        std::map<StdString, ETranformationType>::const_iterator ite = (*CAxis::transformationMapList_ptr).end(), it;
+        it = (*CAxis::transformationMapList_ptr).find(nodeElementName);
         if (ite != it)
         {