Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/node/domain.cpp

    r1509 r1542  
    150150     } 
    151151 
    152      boost::unordered_map<int, vector<size_t> >::const_iterator itIndexEnd = indSrv_[client->serverSize].end(); 
     152     std::unordered_map<int, vector<size_t> >::const_iterator itIndexEnd = indSrv_[client->serverSize].end(); 
    153153     // std::map<int, std::vector<int> >::const_iterator itWrittenIndexEnd = indWrittenSrv_.end(); 
    154154     for (size_t k = 0; k < connectedServerRank_[client->serverSize].size(); ++k) 
    155155     { 
    156156       int rank = connectedServerRank_[client->serverSize][k]; 
    157        boost::unordered_map<int, std::vector<size_t> >::const_iterator it = indSrv_[client->serverSize].find(rank); 
     157       std::unordered_map<int, std::vector<size_t> >::const_iterator it = indSrv_[client->serverSize].find(rank); 
    158158       size_t idxCount = (it != itIndexEnd) ? it->second.size() : 0; 
    159159 
    … …  
    18381838           CServerDistributionDescription serverDescription(nGlobDomain, nbServer); 
    18391839           std::vector<int> serverZeroIndex; 
    1840            if (isUnstructed_) serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0); 
    1841            else serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 1); 
     1840           if (isUnstructed_) serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t&,size_t&>(indexBegin, indexEnd), 0); 
     1841           else serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t&,size_t&>(indexBegin, indexEnd), 1); 
    18421842 
    18431843           std::list<int> serverZeroIndexLeader; 
    … …  
    18961896 
    18971897      size_t nbWritten = 0, indGlo;       
    1898       boost::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(), 
     1898      std::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(), 
    18991899                                                          ite = globalLocalIndexMap_.end(), it;           
    19001900      CArray<size_t,1>::const_iterator itSrvb = writtenGlobalIndex.begin(), 
    … …  
    19321932      // { 
    19331933      //   nbWritten = 0; 
    1934       //   boost::unordered_map<size_t,size_t> localGlobalIndexMap; 
     1934      //   std::unordered_map<size_t,size_t> localGlobalIndexMap; 
    19351935      //   for (itSrv = itSrvb; itSrv != itSrve; ++itSrv) 
    19361936      //   { 
    … …  
    19961996      const CArray<size_t,1>& writtenGlobalIndex  = srvDist.getGlobalIndex(); 
    19971997 
    1998       boost::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(), 
     1998      std::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(), 
    19991999                                                          ite = globalLocalIndexMap_.end(), it;    
    20002000      CArray<size_t,1>::const_iterator itSrvb = writtenGlobalIndex.begin(), 
    20012001                                       itSrve = writtenGlobalIndex.end(), itSrv; 
    2002       boost::unordered_map<size_t,size_t> localGlobalIndexMap; 
     2002      std::unordered_map<size_t,size_t> localGlobalIndexMap; 
    20032003      for (itSrv = itSrvb; itSrv != itSrve; ++itSrv) 
    20042004      { 
    … …  
    20762076      list<CArray<int,1> > list_indZoom, list_writtenInd, list_indGlob; 
    20772077 
    2078       boost::unordered_map<int, vector<size_t> >::const_iterator itIndex, iteIndex; 
     2078      std::unordered_map<int, vector<size_t> >::const_iterator itIndex, iteIndex; 
    20792079      iteIndex = indSrv_[serverSize].end(); 
    20802080      for (int k = 0; k < connectedServerRank_[serverSize].size(); ++k) 
    … …  
    21772177      list<CArray<bool,1> > list_mask; 
    21782178 
    2179       boost::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
     2179      std::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
    21802180      iteMap = indSrv_[serverSize].end(); 
    21812181      for (int k = 0; k < connectedServerRank_[serverSize].size(); ++k) 
    … …  
    22242224      list<CArray<double,1> > list_area; 
    22252225 
    2226       boost::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
     2226      std::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
    22272227      iteMap = indSrv_[serverSize].end(); 
    22282228      for (int k = 0; k < connectedServerRank_[serverSize].size(); ++k) 
    … …  
    22752275      list<CArray<double,2> > list_boundslon, list_boundslat; 
    22762276 
    2277       boost::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
     2277      std::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
    22782278      iteMap = indSrv_[serverSize].end(); 
    22792279      for (int k = 0; k < connectedServerRank_[serverSize].size(); ++k) 
    … …  
    23922392      } 
    23932393 
    2394       boost::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
     2394      std::unordered_map<int, vector<size_t> >::const_iterator it, iteMap; 
    23952395      iteMap = indSrv_[serverSize].end(); 
    23962396      for (int k = 0; k < connectedServerRank_[serverSize].size(); ++k) 
Note: See TracChangeset for help on using the changeset viewer.