Changeset 1646 for XIOS/dev/dev_trunk_omp/src/transformation/grid_transformation.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/src/transformation/grid_transformation.cpp (modified) (23 diffs)

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

@@ -38 +38 @@
 */
 void CGridTransformation::selectScalarAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder)
+TRY
 {
   std::vector<CScalar*> scaListDestP = gridDestination_->getScalars();
@@ -59 +60 @@
   algoTransformation_.push_back(algo);
 }
+CATCH
 
 /*!
@@ -67 +69 @@
 */
 void CGridTransformation::selectAxisAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder)
+TRY
 {
   std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
@@ -88 +91 @@
   algoTransformation_.push_back(algo);
 }
+CATCH
 
 /*!
@@ -96 +100 @@
 */
 void CGridTransformation::selectDomainAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder)
+TRY
 {
   std::vector<CDomain*> domainListDestP = gridDestination_->getDomains();
@@ -117 +122 @@
   algoTransformation_.push_back(algo);
 }
+CATCH
 
 /*!
@@ -123 +129 @@
 */
 std::map<int,std::pair<int,int> > CGridTransformation::getElementPosition(CGrid* grid)
+TRY
 {
   std::vector<CScalar*> scalarListP = grid->getScalars(); 
@@ -155 +162 @@
   return elementPosition;  
 }
+CATCH
 
 /*!
@@ -163 +171 @@
 */
 void CGridTransformation::setUpGridDestination(int elementPositionInGrid, ETranformationType transType)
+TRY
 {
   if (isSpecialTransformation(transType)) return;
@@ -240 +249 @@
   tempGridDests_.push_back(tmpGridDestination_);
 }
+CATCH
 
 /*!
@@ -249 +259 @@
 */
 void CGridTransformation::setUpGridSource(int elementPositionInGrid)
+TRY
 {
   if (!tempGridSrcs_.empty() && (getNbAlgo()-1) == tempGridSrcs_.size())
@@ -326 +337 @@
   tempGridSrcs_.push_back(gridSource_);
 }
+CATCH
 
 /*!
@@ -336 +348 @@
 */
 void CGridTransformation::computeAll(const std::vector<CArray<double,1>* >& dataAuxInputs, Time timeStamp)
+TRY
 {
   if (nbNormalAlgos_ < 1) return;
@@ -346 +359 @@
       std::list<RecvIndexGridDestinationMap>().swap(localIndexToReceiveOnGridDest_);
       std::list<size_t>().swap(nbLocalIndexOnGridDest_);
-      std::list<std::vector<bool> >().swap(localMaskOnGridDest_);
     }
     else
@@ -399 +411 @@
         vector<int> localDst ;
         vector<double> weight ;
-        localMaskOnGridDest_.push_back(vector<bool>()) ;
+        int nbLocalIndexOnGridDest;
         CTimer::get("computeTransformationMappingNonDistributed").resume();  
         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(nbLocalIndexOnGridDest) ;
         int clientRank=client->clientRank ;
         {
@@ -453 +465 @@
   }
 }
+CATCH
 
 /*!
@@ -459 +472 @@
 */
 void CGridTransformation::computeTransformationMapping(const SourceDestinationIndexMap& globaIndexWeightFromSrcToDst)
+TRY
 {
   CContext* context = CContext::getCurrent();
@@ -472 +486 @@
   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
@@ -653 +667 @@
         recvTmp[recvRank][realRecvSize].first = globalLocalIndexGridDestSendToServer[recvIndexDst(idx)];
         recvTmp[recvRank][realRecvSize].second = recvWeightDst(idx);
-        tmpMask[globalLocalIndexGridDestSendToServer[recvIndexDst(idx)]] = true;
          ++realRecvSize;
       }
@@ -678 +691 @@
 
 }
+CATCH
 
 /*!
@@ -684 +698 @@
 */
 const std::list<CGridTransformation::SendingIndexGridSourceMap>& CGridTransformation::getLocalIndexToSendFromGridSource() const
+TRY
 {
   return localIndexToSendFromGridSource_;
 }
+CATCH
 
 /*!
@@ -693 +709 @@
 */
 const std::list<CGridTransformation::RecvIndexGridDestinationMap>& CGridTransformation::getLocalIndexToReceiveOnGridDest() const
+TRY
 {
   return localIndexToReceiveOnGridDest_;
 }
+CATCH
 
 /*!
@@ -702 +720 @@
 */
 const std::list<size_t>& CGridTransformation::getNbLocalIndexToReceiveOnGridDest() const
+TRY
 {
   return nbLocalIndexOnGridDest_;
 }
-
-/*!
-  Local mask of data which will be received on the grid destination
-  \return local mask of data
-*/
-const std::list<std::vector<bool> >& CGridTransformation::getLocalMaskIndexOnGridDest() const
-{
-  return localMaskOnGridDest_;
-}
-
-}
+CATCH
+
+}