Changeset 1298

Timestamp:

10/09/17 10:02:17 (7 years ago)

Author:

ymipsl

Message:

Bug fix for generic transformation. By default redondant source points are now correctly eliminated from transformation.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/transformation

Files:

• generic_algorithm_transformation.cpp (modified) (5 diffs)
• generic_algorithm_transformation.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.cpp

@@ -19 +19 @@
  : transformationMapping_(), transformationWeight_(), transformationPosition_(),
    idAuxInputs_(), type_(ELEMENT_NO_MODIFICATION_WITH_DATA), indexElementSrc_(),
-   computedProcSrcNonTransformedElement_(false)
+   computedProcSrcNonTransformedElement_(false), eliminateRedondantSrc_(true)
 {
 }
@@ -199 +199 @@
   computeGlobalIndexOnProc = (0 < recvValue);
 
+  CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc;
+  
   if (computeGlobalIndexOnProc || !computedProcSrcNonTransformedElement_)
   {    
@@ -204 +206 @@
     if (globalElementIndexOnProc_.empty())
       globalElementIndexOnProc_.resize(axisDomainDstOrder.numElements());
-    CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc;  
+    
     for (idx = 0; idx < axisDomainDstOrder.numElements(); ++idx)
     {
@@ -318 +320 @@
         {          
           tmpCounter.insert(srcIndex[idx]);
+
+           std::vector<int>& srcProc = globalIndexOfTransformedElementOnProc[srcIndex[idx]];
+           for (int j = 0; j < srcProc.size(); ++j)
+              globalElementIndexOnProc_[elementPositionInGrid][srcProc[j]].push_back(srcIndex[idx]);
+/*          
           for (int j = 0; j < procContainSrcElementIdx_.size(); ++j)
-            globalElementIndexOnProc_[elementPositionInGrid][procContainSrcElementIdx_[j]].push_back(srcIndex[idx]);
+            globalElementIndexOnProc_[elementPositionInGrid][procContainSrcElementIdx_[j]].push_back(srcIndex[idx]);*/
         }
       }
@@ -513 +520 @@
   // eliminate redondant global src point owned by differrent processes.
   // Avoid as possible to tranfer data from an other process if the src point is also owned by current process 
-
-   int rankSrc ;
-   size_t globalSrcIndex ;
-   size_t globalDstIndex ;
-   double weight ;
+      int rankSrc ;
+      size_t globalSrcIndex ;
+      size_t globalDstIndex ;
+      double weight ;
  
-   SourceDestinationIndexMap::iterator rankIt,rankIte ;
-   boost::unordered_map<size_t, std::vector<std::pair<size_t,double> > >::iterator globalSrcIndexIt, globalSrcIndexIte ;
-   std::vector<std::pair<size_t,double> >::iterator vectIt,vectIte ;
+      SourceDestinationIndexMap::iterator rankIt,rankIte ;
+      boost::unordered_map<size_t, std::vector<std::pair<size_t,double> > >::iterator globalSrcIndexIt, globalSrcIndexIte ;
+      std::vector<std::pair<size_t,double> >::iterator vectIt,vectIte ;
    
-   rankIt=globaIndexWeightFromSrcToDst_tmp.begin() ; rankIte=globaIndexWeightFromSrcToDst_tmp.end() ;
-   for(;rankIt!=rankIte;++rankIt)
-   {
-     rankSrc = rankIt->first ;
-     globalSrcIndexIt = rankIt->second.begin() ; globalSrcIndexIte = rankIte->second.end() ;
-     for(;globalSrcIndexIt!=globalSrcIndexIte;++globalSrcIndexIt)
-     {
-       globalSrcIndex = globalSrcIndexIt->first ;
-       vectIt = globalSrcIndexIt->second.begin() ; vectIte = globalSrcIndexIt->second.end() ;
-       for(vectIt; vectIt!=vectIte; vectIt++)
-       {
-         globalDstIndex = vectIt->first ;
-         weight = vectIt->second ;
-         if (rankMap[make_pair(globalSrcIndex,globalDstIndex)] == rankSrc)  
-           globaIndexWeightFromSrcToDst[rankSrc][globalSrcIndex].push_back(make_pair(globalDstIndex,weight)) ;
+      rankIt=globaIndexWeightFromSrcToDst_tmp.begin() ; rankIte=globaIndexWeightFromSrcToDst_tmp.end() ;
+      for(;rankIt!=rankIte;++rankIt)
+      {
+        rankSrc = rankIt->first ;
+        globalSrcIndexIt = rankIt->second.begin() ; globalSrcIndexIte = rankIt->second.end() ;
+        for(;globalSrcIndexIt!=globalSrcIndexIte;++globalSrcIndexIt)
+        { 
+          globalSrcIndex = globalSrcIndexIt->first ;
+          vectIt = globalSrcIndexIt->second.begin() ; vectIte = globalSrcIndexIt->second.end() ;
+          for(vectIt; vectIt!=vectIte; vectIt++)
+          {
+            globalDstIndex = vectIt->first ;
+            weight = vectIt->second ;
+            if (eliminateRedondantSrc_)
+            {
+              if (rankMap[make_pair(globalSrcIndex,globalDstIndex)] == rankSrc)  
+                globaIndexWeightFromSrcToDst[rankSrc][globalSrcIndex].push_back(make_pair(globalDstIndex,weight)) ;
+            }
+            else globaIndexWeightFromSrcToDst[rankSrc][globalSrcIndex].push_back(make_pair(globalDstIndex,weight)) ;
+         }
        }
      }
-   }
-
 
 }

XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.hpp

@@ -150 +150 @@
   std::map<int, int> elementPositionInGridSrc2AxisPosition_, elementPositionInGridSrc2DomainPosition_, elementPositionInGridSrc2ScalarPosition_;
   std::map<int, int> elementPositionInGridDst2AxisPosition_, elementPositionInGridDst2DomainPosition_, elementPositionInGridDst2ScalarPosition_;
+
+  bool eliminateRedondantSrc_ ; // flag to indicate if the transformation must select only one global source point for all proc.
+                               // In this case it will choose preferentially the current process 
 };