Changeset 1425
- Timestamp:
- 02/09/18 15:37:13 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/transformation/generic_algorithm_transformation.cpp
r1420 r1425 1038 1038 vector<int>& localSrc, vector<int>& localDst, vector<double>& weight, CArray<bool,1>& localMaskOnGridSrc, vector<bool>& localMaskOnGridDest ) 1039 1039 { 1040 int masked_ ; 1040 1041 if (currentPos!=elementPositionInGrid) 1041 1042 { … … 1046 1047 for(int i=0;i<nIndexSrc[currentPos];i++) 1047 1048 { 1048 if (!mask(i)) masked=false ; 1049 nonDistributedrecursiveFunct(currentPos-1, masked, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight, currentInd, localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ; 1049 masked_=masked ; 1050 if (!mask(i)) masked_=false ; 1051 nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight, currentInd, localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ; 1050 1052 } 1051 1053 } … … 1070 1072 (it->first)++ ; 1071 1073 } 1072 if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ;1073 1074 } 1074 1075 if (t < dstIndWeight.size()-1) t++ ; 1076 if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ; 1075 1077 } 1076 1078 srcInd++ ; … … 1088 1090 { 1089 1091 t=0 ; 1090 if (!mask(i)) masked=false ; 1091 nonDistributedrecursiveFunct(currentPos-1, masked, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight , i, localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ; 1092 masked_=masked ; 1093 if (!mask(i)) masked_=false ; 1094 nonDistributedrecursiveFunct(currentPos-1, masked_, elementPositionInGrid, maskSrc, maskDst, srcInd, srcIndCompressed, nIndexSrc, t, dstIndWeight , i, localSrc, localDst, weight, localMaskOnGridSrc, localMaskOnGridDest) ; 1092 1095 } 1093 1096 } … … 1112 1115 (it->first)++ ; 1113 1116 } 1114 if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ; 1115 } 1117 } 1116 1118 if (t < dstIndWeight.size()-1) t++ ; 1119 if (localMaskOnGridSrc(srcInd)) srcIndCompressed ++ ; 1117 1120 } 1118 1121 srcInd++ ;
Note: See TracChangeset
for help on using the changeset viewer.