Changeset 671


Ignore:
Timestamp:
08/25/15 10:50:20 (6 years ago)
Author:
rlacroix
Message:

Avoid using C++11 feature for now.

Location:
XIOS/trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/node/domain.cpp

    r668 r671  
    842842      std::vector<int> permutIndex(indexSize); 
    843843      XIOSAlgorithms::fillInIndex(indexSize, permutIndex); 
    844       XIOSAlgorithms::sortWithIndex<size_t>(it->second, permutIndex); 
     844      XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(it->second, permutIndex); 
    845845      BinarySearch binSearch(it->second); 
    846846      int nb = globalIndexDomainZoom.numElements(); 
  • XIOS/trunk/src/node/grid.cpp

    r668 r671  
    374374       std::vector<int> permutIndex(indexSize); 
    375375       XIOSAlgorithms::fillInIndex(indexSize, permutIndex); 
    376        XIOSAlgorithms::sortWithIndex<size_t>(itGlobalMap->second, permutIndex); 
     376       XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(itGlobalMap->second, permutIndex); 
    377377       BinarySearch binSearch(itGlobalMap->second); 
    378378       for (int i = 0; i < nbGlobalIndex; ++i) 
     
    617617        std::vector<int> permutIndex(indexSize); 
    618618        XIOSAlgorithms::fillInIndex(indexSize, permutIndex); 
    619         XIOSAlgorithms::sortWithIndex<size_t>(itGlobalMap->second, permutIndex); 
     619        XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(itGlobalMap->second, permutIndex); 
    620620        BinarySearch binSearch(itGlobalMap->second); 
    621621 
  • XIOS/trunk/src/transformation/grid_transformation.cpp

    r668 r671  
    472472 typedef XIOSBinarySearchWithIndex<size_t> BinarySearch; 
    473473 XIOSAlgorithms::fillInIndex(globalIndexOfCurrentGridSource_.size(), permutIndex); 
    474  XIOSAlgorithms::sortWithIndex<size_t>(globalIndexOfCurrentGridSource_, permutIndex); 
     474 XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOfCurrentGridSource_, permutIndex); 
    475475 BinarySearch searchCurrentSrc(globalIndexOfCurrentGridSource_); 
    476476 std::vector<int>::iterator itbIndex = permutIndex.begin(), itIndex, 
     
    603603  // Find out local index on grid destination (received) 
    604604  XIOSAlgorithms::fillInIndex(globalIndexOnClientDest.size(), permutIndex); 
    605   XIOSAlgorithms::sortWithIndex<size_t>(globalIndexOnClientDest, permutIndex); 
     605  XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOnClientDest, permutIndex); 
    606606  itbIndex = permutIndex.begin(); 
    607607  iteIndex = permutIndex.end(); 
     
    633633  std::map<int,std::vector<size_t> >::const_iterator itbMap, itMap, iteMap; 
    634634  XIOSAlgorithms::fillInIndex(globalIndexOnClientSrc.size(), permutIndex); 
    635   XIOSAlgorithms::sortWithIndex<size_t>(globalIndexOnClientSrc, permutIndex); 
     635  XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOnClientSrc, permutIndex); 
    636636  itbIndex = permutIndex.begin(); 
    637637  iteIndex = permutIndex.end(); 
  • XIOS/trunk/src/utils.hpp

    r668 r671  
    307307{ 
    308308public: 
    309   template<typename T, template <class> class StoragePolicy = CVectorStorage> 
     309  template<typename T, template <class> class StoragePolicy> 
    310310  static void sortWithIndex(const typename StoragePolicy<T>::StorageType& values, std::vector<int>& rv) 
    311311  { 
Note: See TracChangeset for help on using the changeset viewer.