Changeset 1311 for XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp
- Timestamp:
- 10/24/17 11:03:29 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp
r1305 r1311 1040 1040 if (!mask_2d.isEmpty()) 1041 1041 { 1042 mask_1d.resize(mask_2d.extent(0) * mask_2d.extent(1));1042 domainMask.resize(mask_2d.extent(0) * mask_2d.extent(1)); 1043 1043 for (int j = 0; j < nj; ++j) 1044 for (int i = 0; i < ni; ++i) mask_1d(i+j*ni) = mask_2d(i,j);1045 mask_2d.reset();1044 for (int i = 0; i < ni; ++i) domainMask(i+j*ni) = mask_2d(i,j); 1045 // mask_2d.reset(); 1046 1046 } 1047 1047 else if (mask_1d.isEmpty()) 1048 1048 { 1049 mask_1d.resize(i_index.numElements());1050 for (int i = 0; i < i_index.numElements(); ++i) mask_1d(i) = true;1049 domainMask.resize(i_index.numElements()); 1050 for (int i = 0; i < i_index.numElements(); ++i) domainMask(i) = true; 1051 1051 } 1052 1052 } … … 1197 1197 { 1198 1198 ind=i+ni*j ; 1199 localMask(ind)= mask_1d(ind) ;1199 localMask(ind)=domainMask(ind) ; 1200 1200 } 1201 1201 } … … 2186 2186 { 2187 2187 idx = static_cast<int>(it->second[n]); 2188 list_mask.back()(n) = mask_1d(globalLocalIndexMap_[idx]);2188 list_mask.back()(n) = domainMask(globalLocalIndexMap_[idx]); 2189 2189 } 2190 2190 … … 2660 2660 nbMaskInd = globalLocalIndexMap_.size(); 2661 2661 mask_1d.resize(nbMaskInd); 2662 domainMask.resize(nbMaskInd); 2662 2663 mask_1d = false; 2663 2664 … … 2672 2673 mask_1d(lInd) = tmp(ind); 2673 2674 } 2674 } 2675 } 2676 domainMask=mask_1d ; 2675 2677 } 2676 2678 … … 3012 3014 dataJIndex(lInd) = (-1 == dataJIndex(lInd)) ? tmpJ(ind) : dataJIndex(lInd); 3013 3015 3014 if (! mask_1d(lInd)) // Include mask info into data index on the RECEIVE getServerDimensionSizes3016 if (!domainMask(lInd)) // Include mask info into data index on the RECEIVE getServerDimensionSizes 3015 3017 { 3016 3018 dataIIndex(lInd) = dataJIndex(lInd) = -1;
Note: See TracChangeset
for help on using the changeset viewer.