Changeset 1425 for XIOS/dev/XIOS_DEV_CMIP6/src

Timestamp:

02/09/18 15:37:13 (6 years ago)

Author:

ymipsl

Message:

Non Distributed transformation : Bug fix introduced in rev1420.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.cpp (modified) (5 diffs)

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

@@ -1038 +1038 @@
                     vector<int>& localSrc, vector<int>& localDst, vector<double>& weight,  CArray<bool,1>& localMaskOnGridSrc, vector<bool>& localMaskOnGridDest )
 {
+  int masked_ ;
   if (currentPos!=elementPositionInGrid)
   {
@@ -1046 +1047 @@
       for(int i=0;i<nIndexSrc[currentPos];i++)
       {
-        if (!mask(i)) masked=false ;
-        nonDistributedrecursiveFunct(currentPos-1, masked, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight, currentInd, localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ;
+        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) ;
       }
     }
@@ -1070 +1072 @@
               (it->first)++ ;
             }
-            if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;
           }
           if (t < dstIndWeight.size()-1) t++ ;
+          if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;
         }
         srcInd++ ;
@@ -1088 +1090 @@
       {
         t=0 ;
-        if (!mask(i)) masked=false ; 
-        nonDistributedrecursiveFunct(currentPos-1, masked, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight , i,  localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ;
+        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) ;
       }
     }
@@ -1112 +1115 @@
               (it->first)++ ;
             }
-            if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;
-          }
+           }
           if (t < dstIndWeight.size()-1) t++ ;
+          if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;
         }
         srcInd++ ;