Changeset 653 for XIOS/trunk/src/distribution.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/distribution.cpp (modified) (1 diff)

XIOS/trunk/src/distribution.cpp

@@ -11 +11 @@
 namespace xios {
 
-CDistribution::CDistribution(int rank, int dims, CArray<size_t,1>* globalIndex)
-  : rank_(rank), dims_(dims), globalIndex_(globalIndex)
+CDistribution::CDistribution(int rank, int dims, const CArray<size_t,1>& globalIndex)
+  : rank_(rank), dims_(dims), globalIndex_(globalIndex.shape())
 {
-  if (0 != globalIndex)
-  {
-    globalIndex_ = new CArray<size_t,1>(globalIndex->numElements());
-    *globalIndex_ = *globalIndex;
-  }
+  if (0 != globalIndex.numElements())
+    globalIndex_ = globalIndex;
 }
 
 CDistribution::~CDistribution()
-{
-  if (0 != globalIndex_) delete globalIndex_;
-}
+{ /* Nothing to do */ }
 
 const CArray<size_t,1>& CDistribution::getGlobalIndex() const
 {
-  return (*globalIndex_);
+  return globalIndex_;
 }