Changeset 653 for XIOS/trunk/src/transformation/grid_transformation.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/transformation/grid_transformation.cpp (modified) (15 diffs)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -72 +72 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
+  CContextClient* client = context->client;
 
   CDistributionClient distribution(client->clientRank, originalGridSource_);
   const CArray<size_t,1>& globalIndexGridDestSendToServer = distribution.getGlobalDataIndexSendToServer();
 
-  globalIndexOfCurrentGridSource_   = new CArray<size_t,1>(globalIndexGridDestSendToServer.numElements());
-  globalIndexOfOriginalGridSource_  = new CArray<size_t,1>(globalIndexGridDestSendToServer.numElements());
-  weightOfGlobalIndexOfOriginalGridSource_  = new CArray<double,1>(globalIndexGridDestSendToServer.numElements());
-  *globalIndexOfCurrentGridSource_  = globalIndexGridDestSendToServer;
-  *globalIndexOfOriginalGridSource_ = globalIndexGridDestSendToServer;
-  *weightOfGlobalIndexOfOriginalGridSource_ = 1.0;
+  globalIndexOfCurrentGridSource_.resize(globalIndexGridDestSendToServer.numElements());
+  globalIndexOfOriginalGridSource_.resize(globalIndexGridDestSendToServer.numElements());
+  weightOfGlobalIndexOfOriginalGridSource_.resize(globalIndexGridDestSendToServer.numElements());
+  globalIndexOfCurrentGridSource_  = globalIndexGridDestSendToServer;
+  globalIndexOfOriginalGridSource_ = globalIndexGridDestSendToServer;
+  weightOfGlobalIndexOfOriginalGridSource_ = 1.0;
 }
 
@@ -90 +90 @@
                                                               ite = algoTransformation_.end();
   for (it = itb; it != ite; ++it) delete (*it);
-
-  std::map<int, CArray<int,1>* >::const_iterator itMap, iteMap;
-  itMap = localIndexToSendFromGridSource_.begin();
-  iteMap = localIndexToSendFromGridSource_.end();
-  for (; itMap != iteMap; ++itMap) delete (itMap->second);
-
-  if (0 != globalIndexOfCurrentGridSource_) delete globalIndexOfCurrentGridSource_;
-  if (0 != globalIndexOfOriginalGridSource_) delete globalIndexOfOriginalGridSource_;
-  if (0 != weightOfGlobalIndexOfOriginalGridSource_) delete weightOfGlobalIndexOfOriginalGridSource_;
 }
 
@@ -344 +335 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
+  CContextClient* client = context->client;
 
   ListAlgoType::const_iterator itb = listAlgos_.begin(),
@@ -394 +385 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
+  CContextClient* client = context->client;
 
   //First of all, retrieve info of local mask of grid destination
@@ -406 +397 @@
 
   // Then find out which index became invalid (become masked after being applied the algorithms, or demande some masked points from grid source)
-  int num = globalIndexOfOriginalGridSource_->numElements();
+  int num = globalIndexOfOriginalGridSource_.numElements();
   const size_t sfmax = NumTraits<unsigned long>::sfmax();
   int maskIndexNum = 0;
   for (int idx = 0; idx < num; ++idx)
   {
-    if (sfmax == (*globalIndexOfOriginalGridSource_)(idx))
-    {
-      size_t maskedGlobalIndex = (*globalIndexOfCurrentGridSource_)(idx);
+    if (sfmax == globalIndexOfOriginalGridSource_(idx))
+    {
+      size_t maskedGlobalIndex = globalIndexOfCurrentGridSource_(idx);
       itArr = std::find(itbArr, iteArr, maskedGlobalIndex);
       if (iteArr != itArr) ++maskIndexNum;
@@ -419 +410 @@
   }
 
-  CArray<int,1>* maskIndexToModify = new CArray<int,1>(maskIndexNum);
+  CArray<int,1> maskIndexToModify(maskIndexNum);
   maskIndexNum = 0;
   for (int idx = 0; idx < num; ++idx)
   {
-    if (sfmax == (*globalIndexOfOriginalGridSource_)(idx))
-    {
-      size_t maskedGlobalIndex = (*globalIndexOfCurrentGridSource_)(idx);
+    if (sfmax == globalIndexOfOriginalGridSource_(idx))
+    {
+      size_t maskedGlobalIndex = globalIndexOfCurrentGridSource_(idx);
       itArr = std::find(itbArr, iteArr, maskedGlobalIndex);
       if (iteArr != itArr)
       {
         int localIdx = std::distance(itbArr, itArr);
-        (*maskIndexToModify)(maskIndexNum) = (localMaskIndexOnClientDest)(localIdx);
+        maskIndexToModify(maskIndexNum) = localMaskIndexOnClientDest(localIdx);
         ++maskIndexNum;
       }
@@ -436 +427 @@
   }
 
-  gridDestination_->modifyMask(*maskIndexToModify);
-
-  delete maskIndexToModify;
+  gridDestination_->modifyMask(maskIndexToModify);
 }
 
@@ -449 +438 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
+  CContextClient* client = context->client;
 
   CTransformationMapping transformationMap(gridDestination_, gridSource_);
@@ -462 +451 @@
   std::map<int,std::vector<size_t> >::const_iterator itbSend = globalIndexToSend.begin(), itSend,
                                                      iteSend = globalIndexToSend.end();
-  CArray<size_t,1>::const_iterator itbArr = globalIndexOfCurrentGridSource_->begin(), itArr,
-                                   iteArr = globalIndexOfCurrentGridSource_->end();
+  CArray<size_t,1>::const_iterator itbArr = globalIndexOfCurrentGridSource_.begin(), itArr,
+                                   iteArr = globalIndexOfCurrentGridSource_.end();
  int sendBuffSize = 0;
  for (itSend = itbSend; itSend != iteSend; ++itSend) sendBuffSize += (itSend->second).size();
@@ -486 +475 @@
      {
        int index = std::distance(itbArr, itArr);
-       sendBuff[idx+currentBuffPosition] = (*globalIndexOfOriginalGridSource_)(index);
+       sendBuff[idx+currentBuffPosition] = globalIndexOfOriginalGridSource_(index);
      }
    }
@@ -525 +514 @@
  }
 
- if (globalIndexOfCurrentGridSource_->numElements()  != nbCurrentGridSource)
+ if (globalIndexOfCurrentGridSource_.numElements() != nbCurrentGridSource)
  {
-   delete globalIndexOfCurrentGridSource_;
-   globalIndexOfCurrentGridSource_ = new CArray<size_t,1>(nbCurrentGridSource);
-   delete globalIndexOfOriginalGridSource_;
-   globalIndexOfOriginalGridSource_ = new CArray<size_t,1>(nbCurrentGridSource);
-   delete weightOfGlobalIndexOfOriginalGridSource_;
-   weightOfGlobalIndexOfOriginalGridSource_ = new CArray<double,1>(nbCurrentGridSource);
+   globalIndexOfCurrentGridSource_.resize(nbCurrentGridSource);
+   globalIndexOfOriginalGridSource_.resize(nbCurrentGridSource);
+   weightOfGlobalIndexOfOriginalGridSource_.resize(nbCurrentGridSource);
  }
 
@@ -545 +531 @@
      for (int i = 0; i < ssize; ++i)
      {
-       (*globalIndexOfCurrentGridSource_)(k) = ((itRecv->second)[idx][i]).first;
-       (*weightOfGlobalIndexOfOriginalGridSource_)(k) = ((itRecv->second)[idx][i]).second;
-       (*globalIndexOfOriginalGridSource_)(k) = *currentRecvBuff;
+       globalIndexOfCurrentGridSource_(k) = ((itRecv->second)[idx][i]).first;
+       weightOfGlobalIndexOfOriginalGridSource_(k) = ((itRecv->second)[idx][i]).second;
+       globalIndexOfOriginalGridSource_(k) = *currentRecvBuff;
        ++k;
      }
@@ -569 +555 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
+  CContextClient* client = context->client;
 
   CTransformationMapping transformationMap(gridDestination_, originalGridSource_);
 
   std::map<size_t, std::vector<std::pair<size_t,double> > > globaIndexWeightFromDestToSource;
-  int nb = globalIndexOfCurrentGridSource_->numElements();
+  int nb = globalIndexOfCurrentGridSource_.numElements();
   const size_t sfmax = NumTraits<unsigned long>::sfmax();
   for (int idx = 0; idx < nb; ++idx)
   {
-    if (sfmax != (*globalIndexOfOriginalGridSource_)(idx))
-      globaIndexWeightFromDestToSource[(*globalIndexOfCurrentGridSource_)(idx)].push_back(make_pair((*globalIndexOfOriginalGridSource_)(idx),(*weightOfGlobalIndexOfOriginalGridSource_)(idx))) ;
+    if (sfmax != globalIndexOfOriginalGridSource_(idx))
+      globaIndexWeightFromDestToSource[globalIndexOfCurrentGridSource_(idx)].push_back(make_pair(globalIndexOfOriginalGridSource_(idx), weightOfGlobalIndexOfOriginalGridSource_(idx))) ;
   }
 
@@ -638 +624 @@
   for (itMap = itbMap; itMap != iteMap; ++itMap)
   {
-    CArray<int,1>* ptr = new CArray<int,1>((itMap->second).size());
-    localIndexToSendFromGridSource_[itMap->first] = ptr;
     int destRank = itMap->first;
-    int vecSize = (itMap->second).size();
+    int vecSize = itMap->second.size();
+    localIndexToSendFromGridSource_[destRank].resize(vecSize);
     for (int idx = 0; idx < vecSize; ++idx)
     {
-      itArr = std::find(itbArr, iteArr, (itMap->second)[idx]);
+      itArr = std::find(itbArr, iteArr, itMap->second[idx]);
       if (iteArr != itArr)
       {
         int localIdx = std::distance(itbArr, itArr);
-        (*localIndexToSendFromGridSource_[destRank])(idx) = (localIdx);
+        localIndexToSendFromGridSource_[destRank](idx) = localIdx;
       }
     }
@@ -658 +643 @@
   \return local index of data
 */
-const std::map<int, CArray<int,1>* >& CGridTransformation::getLocalIndexToSendFromGridSource() const
+const std::map<int, CArray<int,1> >& CGridTransformation::getLocalIndexToSendFromGridSource() const
 {
   return localIndexToSendFromGridSource_;