Changeset 1589 for XIOS/dev/dev_olga/src/transformation/generic_algorithm_transformation.cpp

Timestamp:

11/05/18 13:57:52 (6 years ago)

Author:

oabramkina

Message:

Backporting r1578 and r1586 to dev, cleaning the code before merging it to XIOS 2.5.

File:

• XIOS/dev/dev_olga/src/transformation/generic_algorithm_transformation.cpp (modified) (8 diffs)

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

@@ -846 +846 @@
                                                                                  vector<int>& localSrc, vector<int>& localDst, vector<double>& weight,
                                                                                  int nlocalIndexDest)
-
-//void CGenericAlgorithmTransformation::computeTransformationMappingNonDistributed(int elementPositionInGrid, CGrid* gridSrc, CGrid* gridDst,
-//                                                                                 vector<int>& localSrc, vector<int>& localDst, vector<double>& weight,
-//                                                                                 vector<bool>& localMaskOnGridDest)
 {
 
@@ -985 +981 @@
   }
 
-// just get the local src mask
-//  CArray<bool,1> localMaskOnSrcGrid;
-//  gridSrc->getLocalMask(localMaskOnSrcGrid) ;
-// intermediate grid, mask is not initialized => set up mask to true
-//  if (localMaskOnSrcGrid.isEmpty())
-//  {
-//    localMaskOnSrcGrid.resize(nlocalIndexSrc) ;
-//    localMaskOnSrcGrid=true ;
-//  }
-  
-
-//  localMaskOnGridDest.resize(nlocalIndexDest,false) ;
-
   vector<vector<vector<pair<int,double> > > > dstIndWeight(transformationMapping_.size()) ;
    
@@ -1038 +1021 @@
                                                                    int& t, vector<vector<vector<pair<int,double> > > >& dstIndWeight, int currentInd,
                                                                    vector<int>& localSrc, vector<int>& localDst, vector<double>& weight)
-//                                                                   CArray<bool,1>& localMaskOnGridSrc
-//                                                                   , vector<bool>& localMaskOnGridDest )
 {
   int masked_ ;
@@ -1052 +1033 @@
         masked_=masked ;
         if (!mask(i)) masked_=false ;
-//        nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight, currentInd, localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ;
         nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t,
-                                     dstIndWeight, currentInd, localSrc, localDst, weight);//, localMaskOnGridDest) ;
+                                     dstIndWeight, currentInd, localSrc, localDst, weight);
       }
     }
@@ -1068 +1048 @@
             for(vector<pair<int,double> >::iterator it = dstIndWeight[t][currentInd].begin(); it!=dstIndWeight[t][currentInd].end(); ++it)
             {
-//              if (localMaskOnGridSrc(srcInd))
-              {
-                localSrc.push_back(srcIndCompressed) ;
-                localDst.push_back(it->first) ;
-                weight.push_back(it->second) ;
-//                localMaskOnGridDest[it->first]=true ;
-              }
+              localSrc.push_back(srcIndCompressed) ;
+              localDst.push_back(it->first) ;
+              weight.push_back(it->second) ;
               (it->first)++ ;
             }
           }
           if (t < dstIndWeight.size()-1) t++ ;
-//          if (localMaskOnGridSrc(srcInd))
             srcIndCompressed ++ ;
         }
@@ -1100 +1075 @@
         nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd,
                                      srcIndCompressed, nIndexSrc, t, dstIndWeight , i,  localSrc, localDst, weight);
-//                                     localMaskOnGridSrc,
-//                                     localMaskOnGridDest) ;
       }
     }
@@ -1115 +1088 @@
             for(vector<pair<int,double> >::iterator it = dstIndWeight[t][i].begin(); it!=dstIndWeight[t][i].end(); ++it)
             {
-//              if (localMaskOnGridSrc(srcInd))
-              {
-                localSrc.push_back(srcIndCompressed) ;
-                localDst.push_back(it->first) ;
-                weight.push_back(it->second) ;
-//                localMaskOnGridDest[it->first]=true ;
-              }
+              localSrc.push_back(srcIndCompressed) ;
+              localDst.push_back(it->first) ;
+              weight.push_back(it->second) ;
               (it->first)++ ;
             }
            }
           if (t < dstIndWeight.size()-1) t++ ;
-//          if (localMaskOnGridSrc(srcInd))
-            srcIndCompressed ++ ;
+          srcIndCompressed ++ ;
         }
         srcInd++ ;
@@ -1135 +1103 @@
 
 }
-
-
-
-
-
-
-
-
-
-
 
 /*!