Changeset 1584 for XIOS/dev/dev_olga/src/transformation/grid_transformation.cpp

Timestamp:

10/12/18 16:02:37 (6 years ago)

Author:

oabramkina

Message:

Clean-up in transformation classes related to the new treatment of grid mask at the entrance of a workflow.

File:

• XIOS/dev/dev_olga/src/transformation/grid_transformation.cpp (modified) (5 diffs)

XIOS/dev/dev_olga/src/transformation/grid_transformation.cpp

@@ -346 +346 @@
       std::list<RecvIndexGridDestinationMap>().swap(localIndexToReceiveOnGridDest_);
       std::list<size_t>().swap(nbLocalIndexOnGridDest_);
-      std::list<std::vector<bool> >().swap(localMaskOnGridDest_);
+//      std::list<std::vector<bool> >().swap(localMaskOnGridDest_);
     }
     else
@@ -399 +399 @@
         vector<int> localDst ;
         vector<double> weight ;
-        localMaskOnGridDest_.push_back(vector<bool>()) ;
+        int nbLocalIndexOnGridDest;
+//        localMaskOnGridDest_.push_back(vector<bool>()) ;
         CTimer::get("computeTransformationMappingNonDistributed").resume();  
+//        algo->computeTransformationMappingNonDistributed(elementPosition, gridSource_, tmpGridDestination_,
+//                                                         localSrc, localDst, weight, localMaskOnGridDest_.back()) ;
         algo->computeTransformationMappingNonDistributed(elementPosition, gridSource_, tmpGridDestination_, 
-                                                         localSrc, localDst, weight, localMaskOnGridDest_.back()) ;
+                                                         localSrc, localDst, weight, nbLocalIndexOnGridDest) ;
         CTimer::get("computeTransformationMappingNonDistributed").suspend();  
 
         CTimer::get("computeTransformationMappingConvert").resume();  
-        nbLocalIndexOnGridDest_.push_back(localMaskOnGridDest_.back().size()) ;
+//        nbLocalIndexOnGridDest_.push_back(localMaskOnGridDest_.back().size()) ;
+//        nbLocalIndexOnGridDest_.push_back(localMaskOnGridDest_.back().size()) ;
+        nbLocalIndexOnGridDest_.push_back(nbLocalIndexOnGridDest) ;
         int clientRank=client->clientRank ;
         {
@@ -472 +477 @@
   size_t nbLocalIndex = globalLocalIndexGridDestSendToServer.size();
   nbLocalIndexOnGridDest_.push_back(nbLocalIndex);
-  localMaskOnGridDest_.push_back(std::vector<bool>());
-  std::vector<bool>& tmpMask = localMaskOnGridDest_.back();
-  tmpMask.resize(nbLocalIndex,false);
+//  localMaskOnGridDest_.push_back(std::vector<bool>());
+//  std::vector<bool>& tmpMask = localMaskOnGridDest_.back();
+//  tmpMask.resize(nbLocalIndex,false);
 
   // Find out number of index sent from grid source and number of index received on grid destination
@@ -657 +662 @@
         recvTmp[recvRank][realRecvSize].first = globalLocalIndexGridDestSendToServer[recvIndexDst(idx)];
         recvTmp[recvRank][realRecvSize].second = recvWeightDst(idx);
-        tmpMask[globalLocalIndexGridDestSendToServer[recvIndexDst(idx)]] = true;
+//        tmpMask[globalLocalIndexGridDestSendToServer[recvIndexDst(idx)]] = true;
          ++realRecvSize;
       }
@@ -714 +719 @@
   \return local mask of data
 */
-const std::list<std::vector<bool> >& CGridTransformation::getLocalMaskIndexOnGridDest() const
-{
-  return localMaskOnGridDest_;
-}
-
-}
+//const std::list<std::vector<bool> >& CGridTransformation::getLocalMaskIndexOnGridDest() const
+//{
+//  return localMaskOnGridDest_;
+//}
+
+}