Changeset 1601 for XIOS/dev/dev_trunk_omp/src/node/domain.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/domain.cpp (modified) (10 diffs)

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

@@ -19 +19 @@
 #include "client_server_mapping_distributed.hpp"
 
+using namespace ep_lib;
+
 #include <algorithm>
 
@@ -68 +70 @@
    }
 
-   std::map<StdString, ETranformationType> CDomain::transformationMapList_ = std::map<StdString, ETranformationType>();
-   bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(CDomain::transformationMapList_);
+   std::map<StdString, ETranformationType> *CDomain::transformationMapList_ptr = 0;
 
    bool CDomain::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
@@ -82 +83 @@
    }
 
+   bool CDomain::initializeTransformationMap()
+   {
+     CDomain::transformationMapList_ptr = new std::map<StdString, ETranformationType>();
+     (*CDomain::transformationMapList_ptr)["zoom_domain"] = TRANS_ZOOM_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["interpolate_domain"] = TRANS_INTERPOLATE_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["generate_rectilinear_domain"] = TRANS_GENERATE_RECTILINEAR_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["compute_connectivity_domain"] = TRANS_COMPUTE_CONNECTIVITY_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["expand_domain"] = TRANS_EXPAND_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["reorder_domain"] = TRANS_REORDER_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["extract_domain"] = TRANS_EXTRACT_DOMAIN;
+   }
+
    const std::set<StdString> & CDomain::getRelFiles(void) const
    {
@@ -92 +105 @@
      \return the number of indexes written by each server
    */
-   int CDomain::getNumberWrittenIndexes(MPI_Comm writtenCom)
+   int CDomain::getNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return numberWrittenIndexes_[writtenSize];
    }
@@ -103 +116 @@
      \return the total number of indexes written by the servers
    */
-   int CDomain::getTotalNumberWrittenIndexes(MPI_Comm writtenCom)
+   int CDomain::getTotalNumberWrittenIndexes(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return totalNumberWrittenIndexes_[writtenSize];
    }
@@ -114 +127 @@
      \return the offset of indexes written by each server
    */
-   int CDomain::getOffsetWrittenIndexes(MPI_Comm writtenCom)
+   int CDomain::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>& CDomain::getCompressedIndexToWriteOnServer(MPI_Comm writtenCom)
+   CArray<int, 1>& CDomain::getCompressedIndexToWriteOnServer(ep_lib::MPI_Comm writtenCom)
    {
      int writtenSize;
-     MPI_Comm_size(writtenCom, &writtenSize);
+     ep_lib::MPI_Comm_size(writtenCom, &writtenSize);
      return compressedIndexToWriteOnServer[writtenSize];
    }
@@ -654 +667 @@
      int v ;
      v=ibegin ;
-     MPI_Allgather(&v,1,MPI_INT,ibegin_g,1,MPI_INT,client->intraComm) ;
+     ep_lib::MPI_Allgather(&v,1,MPI_INT,ibegin_g,1,MPI_INT,client->intraComm) ;
      v=jbegin ;
-     MPI_Allgather(&v,1,MPI_INT,jbegin_g,1,MPI_INT,client->intraComm) ;
+     ep_lib::MPI_Allgather(&v,1,MPI_INT,jbegin_g,1,MPI_INT,client->intraComm) ;
      v=ni ;
-     MPI_Allgather(&v,1,MPI_INT,ni_g,1,MPI_INT,client->intraComm) ;
+     ep_lib::MPI_Allgather(&v,1,MPI_INT,ni_g,1,MPI_INT,client->intraComm) ;
      v=nj ;
-     MPI_Allgather(&v,1,MPI_INT,nj_g,1,MPI_INT,client->intraComm) ;
-
-     MPI_Allgatherv(lon.dataFirst(),ni,MPI_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,MPI_DOUBLE,client->intraComm) ;
-     MPI_Allgatherv(lat.dataFirst(),nj,MPI_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,MPI_DOUBLE,client->intraComm) ;
+     ep_lib::MPI_Allgather(&v,1,MPI_INT,nj_g,1,MPI_INT,client->intraComm) ;
+
+     ep_lib::MPI_Allgatherv(lon.dataFirst(),ni,MPI_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,MPI_DOUBLE,client->intraComm) ;
+     ep_lib::MPI_Allgatherv(lat.dataFirst(),nj,MPI_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,MPI_DOUBLE,client->intraComm) ;
 
       delete[] ibegin_g ;
@@ -1901 +1914 @@
    }
 
-  void CDomain::computeWrittenCompressedIndex(MPI_Comm writtenComm)
+  void CDomain::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;
@@ -1961 +1974 @@
       {
              
-        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];
       }
@@ -3045 +3058 @@
 
         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 = transformationMapList_ptr->end(), it;
+        it = transformationMapList_ptr->find(nodeElementName);
         if (ite != it)
         {