Changeset 671 for XIOS

Timestamp:

08/25/15 10:50:20 (9 years ago)

Author:

rlacroix

Message:

Avoid using C++11 feature for now.

Location:

XIOS/trunk/src

Files:

• node/domain.cpp (modified) (1 diff)
• node/grid.cpp (modified) (2 diffs)
• transformation/grid_transformation.cpp (modified) (3 diffs)
• utils.hpp (modified) (1 diff)

XIOS/trunk/src/node/domain.cpp

@@ -842 +842 @@
       std::vector<int> permutIndex(indexSize);
       XIOSAlgorithms::fillInIndex(indexSize, permutIndex);
-      XIOSAlgorithms::sortWithIndex<size_t>(it->second, permutIndex);
+      XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(it->second, permutIndex);
       BinarySearch binSearch(it->second);
       int nb = globalIndexDomainZoom.numElements();

XIOS/trunk/src/node/grid.cpp

@@ -374 +374 @@
        std::vector<int> permutIndex(indexSize);
        XIOSAlgorithms::fillInIndex(indexSize, permutIndex);
-       XIOSAlgorithms::sortWithIndex<size_t>(itGlobalMap->second, permutIndex);
+       XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(itGlobalMap->second, permutIndex);
        BinarySearch binSearch(itGlobalMap->second);
        for (int i = 0; i < nbGlobalIndex; ++i)
@@ -617 +617 @@
         std::vector<int> permutIndex(indexSize);
         XIOSAlgorithms::fillInIndex(indexSize, permutIndex);
-        XIOSAlgorithms::sortWithIndex<size_t>(itGlobalMap->second, permutIndex);
+        XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(itGlobalMap->second, permutIndex);
         BinarySearch binSearch(itGlobalMap->second);
 

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -472 +472 @@
  typedef XIOSBinarySearchWithIndex<size_t> BinarySearch;
  XIOSAlgorithms::fillInIndex(globalIndexOfCurrentGridSource_.size(), permutIndex);
- XIOSAlgorithms::sortWithIndex<size_t>(globalIndexOfCurrentGridSource_, permutIndex);
+ XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOfCurrentGridSource_, permutIndex);
  BinarySearch searchCurrentSrc(globalIndexOfCurrentGridSource_);
  std::vector<int>::iterator itbIndex = permutIndex.begin(), itIndex,
@@ -603 +603 @@
   // Find out local index on grid destination (received)
   XIOSAlgorithms::fillInIndex(globalIndexOnClientDest.size(), permutIndex);
-  XIOSAlgorithms::sortWithIndex<size_t>(globalIndexOnClientDest, permutIndex);
+  XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOnClientDest, permutIndex);
   itbIndex = permutIndex.begin();
   iteIndex = permutIndex.end();
@@ -633 +633 @@
   std::map<int,std::vector<size_t> >::const_iterator itbMap, itMap, iteMap;
   XIOSAlgorithms::fillInIndex(globalIndexOnClientSrc.size(), permutIndex);
-  XIOSAlgorithms::sortWithIndex<size_t>(globalIndexOnClientSrc, permutIndex);
+  XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOnClientSrc, permutIndex);
   itbIndex = permutIndex.begin();
   iteIndex = permutIndex.end();

XIOS/trunk/src/utils.hpp

@@ -307 +307 @@
 {
 public:
-  template<typename T, template <class> class StoragePolicy = CVectorStorage>
+  template<typename T, template <class> class StoragePolicy>
   static void sortWithIndex(const typename StoragePolicy<T>::StorageType& values, std::vector<int>& rv)
   {