Changeset 653 for XIOS/trunk/src/server_distribution_description.cpp

Timestamp:

07/24/15 16:40:06 (9 years ago)

Author:

rlacroix

Message:

Distributions and transformations: Avoid using heap allocations.

File:

• XIOS/trunk/src/server_distribution_description.cpp (modified) (4 diffs)

XIOS/trunk/src/server_distribution_description.cpp

@@ -18 +18 @@
 
 CServerDistributionDescription::~CServerDistributionDescription()
-{
-  if (!vecGlobalIndex_.empty())
-    for (int i = 0; i < vecGlobalIndex_.size(); ++i) delete vecGlobalIndex_[i];
-}
+{ /* Nothing to do */ }
 
 /*!
@@ -51 +48 @@
       size_t ssize = 1, idx = 0;
       for (int j = 0; j < dim; ++j) ssize *= dimensionSizes_[idxServer][j];
-      vecGlobalIndex_[idxServer] = new CArray<size_t,1>(ssize);
+      vecGlobalIndex_[idxServer].resize(ssize);
 
       std::vector<int> idxLoop(dim,0);
@@ -79 +76 @@
           {
             mulDim *= nGlobal_[k-1];
-            globalIndex += (currentIndex[k])*mulDim;
+            globalIndex += currentIndex[k] * mulDim;
           }
-          (*vecGlobalIndex_[idxServer])(idx) = globalIndex;
+          vecGlobalIndex_[idxServer](idx) = globalIndex;
           ++idx;
         }
@@ -241 +238 @@
   \return global index on server(s)
 */
-const std::vector<CArray<size_t,1>* >& CServerDistributionDescription::getGlobalIndex() const
+const std::vector<CArray<size_t,1> >& CServerDistributionDescription::getGlobalIndex() const
 {
   return vecGlobalIndex_;