Changeset 1584 for XIOS/dev/dev_olga/src/transformation/generic_algorithm_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/generic_algorithm_transformation.cpp (modified) (11 diffs)

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

@@ -843 +843 @@
 
 
-
 void CGenericAlgorithmTransformation::computeTransformationMappingNonDistributed(int elementPositionInGrid, CGrid* gridSrc, CGrid* gridDst,
-                                                                                 vector<int>& localSrc, vector<int>& localDst, vector<double>& weight, vector<bool>& localMaskOnGridDest)
+                                                                                 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)
 {
 
@@ -871 +875 @@
     
   int nlocalIndexSrc=1 ;
-  int nlocalIndexDest=1 ;
+//  int nlocalIndexDest=1 ;
+  nlocalIndexDest=1 ;
   CArray<bool,1> maskScalar(1) ;
   maskScalar  = true ;
@@ -933 +938 @@
     nlocalIndexDest=nlocalIndexDest*nIndexDst[i] ;
   }
-
-
-
-
-
 
   vector<int> dstLocalInd ;
@@ -986 +986 @@
 
 // just get the local src mask
-  CArray<bool,1> localMaskOnSrcGrid;
-  gridSrc->getLocalMask(localMaskOnSrcGrid) ;
+//  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) ;
+//  if (localMaskOnSrcGrid.isEmpty())
+//  {
+//    localMaskOnSrcGrid.resize(nlocalIndexSrc) ;
+//    localMaskOnSrcGrid=true ;
+//  }
+  
+
+//  localMaskOnGridDest.resize(nlocalIndexDest,false) ;
 
   vector<vector<vector<pair<int,double> > > > dstIndWeight(transformationMapping_.size()) ;
@@ -1023 +1023 @@
   int srcIndCompressed=0 ;
   
+//  nonDistributedrecursiveFunct(nElement-1,true,elementPositionInGrid,maskSrc,maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight,
+//                               currentInd,localSrc,localDst,weight, localMaskOnSrcGrid, localMaskOnGridDest );
+//  nonDistributedrecursiveFunct(nElement-1,true,elementPositionInGrid,maskSrc,maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight,
+//                               currentInd,localSrc,localDst,weight, localMaskOnGridDest );
   nonDistributedrecursiveFunct(nElement-1,true,elementPositionInGrid,maskSrc,maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight,  
-                               currentInd,localSrc,localDst,weight, localMaskOnSrcGrid, localMaskOnGridDest );
+                               currentInd,localSrc,localDst,weight);
                
 }
 
 
-void CGenericAlgorithmTransformation::nonDistributedrecursiveFunct(int currentPos, bool masked, int elementPositionInGrid, vector< CArray<bool,1>* >& maskSrc, vector< CArray<bool,1>* >& maskDst, int& srcInd, int& srcIndCompressed, vector<int>& nIndexSrc, 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 )
+void CGenericAlgorithmTransformation::nonDistributedrecursiveFunct(int currentPos, bool masked, int elementPositionInGrid,
+                                                                   vector< CArray<bool,1>* >& maskSrc, vector< CArray<bool,1>* >& maskDst,
+                                                                   int& srcInd, int& srcIndCompressed, vector<int>& nIndexSrc,
+                                                                   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_ ;
@@ -1043 +1052 @@
         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, localMaskOnGridSrc, localMaskOnGridDest) ;
+        nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t,
+                                     dstIndWeight, currentInd, localSrc, localDst, weight);//, localMaskOnGridDest) ;
       }
     }
@@ -1057 +1068 @@
             for(vector<pair<int,double> >::iterator it = dstIndWeight[t][currentInd].begin(); it!=dstIndWeight[t][currentInd].end(); ++it)
             {
-              if (localMaskOnGridSrc(srcInd))
+//              if (localMaskOnGridSrc(srcInd))
               {
                 localSrc.push_back(srcIndCompressed) ;
                 localDst.push_back(it->first) ;
                 weight.push_back(it->second) ;
-                localMaskOnGridDest[it->first]=true ;
+//                localMaskOnGridDest[it->first]=true ;
               }
               (it->first)++ ;
@@ -1068 +1079 @@
           }
           if (t < dstIndWeight.size()-1) t++ ;
-          if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;
+//          if (localMaskOnGridSrc(srcInd))
+            srcIndCompressed ++ ;
         }
         srcInd++ ;
@@ -1086 +1098 @@
         masked_=masked ;
         if (!mask(i)) masked_=false ; 
-        nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight , i,  localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ;
+        nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd,
+                                     srcIndCompressed, nIndexSrc, t, dstIndWeight , i,  localSrc, localDst, weight);
+//                                     localMaskOnGridSrc,
+//                                     localMaskOnGridDest) ;
       }
     }
@@ -1100 +1115 @@
             for(vector<pair<int,double> >::iterator it = dstIndWeight[t][i].begin(); it!=dstIndWeight[t][i].end(); ++it)
             {
-              if (localMaskOnGridSrc(srcInd))
+//              if (localMaskOnGridSrc(srcInd))
               {
                 localSrc.push_back(srcIndCompressed) ;
                 localDst.push_back(it->first) ;
                 weight.push_back(it->second) ;
-                localMaskOnGridDest[it->first]=true ;
+//                localMaskOnGridDest[it->first]=true ;
               }
               (it->first)++ ;
@@ -1111 +1126 @@
            }
           if (t < dstIndWeight.size()-1) t++ ;
-          if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;
+//          if (localMaskOnGridSrc(srcInd))
+            srcIndCompressed ++ ;
         }
         srcInd++ ;