Changeset 1542 for XIOS/trunk/src/node/axis.cpp

Timestamp:

06/13/18 16:48:53 (6 years ago)

Author:

oabramkina

Message:

Replacing Boost's unordered_map and shared_pointer by its STL counterparts.

Two notes for Curie:

• one can see the content of unordered_map with ddt only if XIOS has been compiled with gnu
• XIOS will not compile any more with pgi (all available versions use old STL which are not up to the c++11 norms)

File:

• XIOS/trunk/src/node/axis.cpp (modified) (7 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -202 +202 @@
      {
        // size estimation for sendDistributedValue
-       boost::unordered_map<int, vector<size_t> >::const_iterator it, ite = indSrv_[client->serverSize].end();
+       std::unordered_map<int, vector<size_t> >::const_iterator it, ite = indSrv_[client->serverSize].end();
        for (it = indSrv_[client->serverSize].begin(); it != ite; ++it)
        {
@@ -623 +623 @@
       
         std::vector<int> serverZeroIndex;
-        serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0);      
+        serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t&,size_t&>(indexBegin, indexEnd), 0);
 
         std::list<int> serverZeroIndexLeader;
@@ -689 +689 @@
     // we need to compute the local index on the server from its corresponding global index
     size_t nbWritten = 0, indGlo;      
-    boost::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),
+    std::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),
                                                         ite = globalLocalIndexMap_.end(), it;          
     CArray<size_t,1>::const_iterator itSrvb = writtenGlobalIndex.begin(),
@@ -721 +721 @@
     {
       nbWritten = 0;
-      boost::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),
+      std::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),
                                                           ite = globalLocalIndexMap_.end(), it;
       for (int i = 0; i < zoom_index.numElements(); ++i)
@@ -745 +745 @@
     // {
     //   nbWritten = 0;
-    //   boost::unordered_map<size_t,size_t> localGlobalIndexMap;
+    //   std::unordered_map<size_t,size_t> localGlobalIndexMap;
     //   for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
     //   {
@@ -810 +810 @@
       CDistributionServer srvDist(server->intraCommSize, nBegin, nSize, nBeginGlobal, nGlob); 
       const CArray<size_t,1>& writtenGlobalIndex  = srvDist.getGlobalIndex();
-      boost::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),
+      std::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),
                                                           ite = globalLocalIndexMap_.end(), it;   
 
       CArray<size_t,1>::const_iterator itSrvb = writtenGlobalIndex.begin(),
                                        itSrve = writtenGlobalIndex.end(), itSrv;
-      boost::unordered_map<size_t,size_t> localGlobalIndexMap;
+      std::unordered_map<size_t,size_t> localGlobalIndexMap;
       for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
       {
@@ -1137 +1137 @@
       }
 
-      boost::unordered_map<int, std::vector<size_t> >::const_iterator it, iteMap;
+      std::unordered_map<int, std::vector<size_t> >::const_iterator it, iteMap;
       iteMap = indSrv_[nbServer].end();
       for (int k = 0; k < connectedServerRank_[nbServer].size(); ++k)