Changeset 1311
- Timestamp:
- 10/24/17 11:03:29 (7 years ago)
- Location:
- XIOS/dev/XIOS_DEV_CMIP6/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/distribution_client.cpp
r1250 r1311 108 108 for (int i = 0; i < domainNum_;++i) 109 109 { 110 domainMasks_[i].resize(domList[i]-> mask_1d.numElements());111 domainMasks_[i] = domList[i]-> mask_1d;110 domainMasks_[i].resize(domList[i]->domainMask.numElements()); 111 domainMasks_[i] = domList[i]->domainMask; 112 112 } 113 113 -
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; -
XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.hpp
r1291 r1311 142 142 CArray<size_t,1> localIndexToWriteOnServer; 143 143 144 CArray<bool, 1> localMask; 144 CArray<bool, 1> domainMask; // mask_1d, mask_2d -> domainMask 145 CArray<bool, 1> localMask; // domainMask + indexing 145 146 bool isCurvilinear ; 146 147 bool hasBounds ; -
XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp
r1294 r1311 362 362 363 363 std::vector<CArray<bool,1>* > domainMasks(domainP.size()); 364 for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]-> mask_1d);364 for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->domainMask); 365 365 std::vector<CArray<bool,1>* > axisMasks(axisP.size()); 366 366 for (int i = 0; i < axisMasks.size(); ++i) axisMasks[i] = &(axisP[i]->mask); … … 404 404 405 405 std::vector<CArray<bool,1>* > domainMasks(domainP.size()); 406 for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]-> mask_1d);406 for (int i = 0; i < domainMasks.size(); ++i) domainMasks[i] = &(domainP[i]->domainMask); 407 407 std::vector<CArray<bool,1>* > axisMasks(axisP.size()); 408 408 for (int i = 0; i < axisMasks.size(); ++i) axisMasks[i] = &(axisP[i]->mask); … … 1775 1775 const CArray<int,1>& axisDomainOrder) 1776 1776 { 1777 globalDim.resize(domains.size()*2+axis.size()+scalars.size()); 1777 // globalDim.resize(domains.size()*2+axis.size()+scalars.size()); 1778 globalDim.resize(domains.size()*2+axis.size()); 1778 1779 int positionDimensionDistributed = 1; 1779 1780 int idx = 0, idxDomain = 0, idxAxis = 0, idxScalar = 0; … … 1805 1806 else 1806 1807 { 1807 globalDim[idx] = 1;1808 // globalDim[idx] = 1; 1808 1809 ++idxScalar; 1809 ++idx;1810 // ++idx; 1810 1811 } 1811 1812 } -
XIOS/dev/XIOS_DEV_CMIP6/src/transformation/axis_algorithm_interpolate.cpp
r937 r1311 313 313 for (size_t idx = 0; idx < vecAxisValueSize; ++idx) 314 314 { 315 if (dom-> mask_1d(idx)) ++vecAxisValueSizeWithMask;315 if (dom->domainMask(idx)) ++vecAxisValueSizeWithMask; 316 316 } 317 317 … … 324 324 for (size_t idx = 0; idx < vecAxisValueSize; ++idx) 325 325 { 326 if (dom-> mask_1d(idx))326 if (dom->domainMask(idx)) 327 327 { 328 328 transPosition_[indexMask].resize(1); … … 345 345 for (size_t idx = 0; idx < vecAxisValueSize; ++idx) 346 346 { 347 if (dom-> mask_1d(idx))347 if (dom->domainMask(idx)) 348 348 { 349 349 size_t axisValueSize = 0; -
XIOS/dev/XIOS_DEV_CMIP6/src/transformation/domain_algorithm_expand.cpp
r1300 r1311 168 168 int njSrc = domainSource->nj, jbegin = domainSource->jbegin; 169 169 int dataDimSrc = domainSource->data_dim; 170 CArray<bool,1>& mask_1d_src = domainSource-> mask_1d;170 CArray<bool,1>& mask_1d_src = domainSource->domainMask; 171 171 CArray<int,1>& i_index_src = domainSource->i_index; 172 172 CArray<int,1>& j_index_src = domainSource->j_index; … … 231 231 domainDestination->global_zoom_nj.setValue(domainSource->global_zoom_nj+2); 232 232 233 CArray<bool,1>& mask_1d_dst = domainDestination-> mask_1d;233 CArray<bool,1>& mask_1d_dst = domainDestination->domainMask; 234 234 CArray<int,1>& i_index_dst = domainDestination->i_index; 235 235 CArray<int,1>& j_index_dst = domainDestination->j_index; … … 453 453 domainDestination->latvalue_1d = (lat_dst); 454 454 } 455 domainDestination->mask_1d.resize(domainDestination->domainMask.numElements()) ; 456 domainDestination->mask_1d=domainDestination->domainMask ; 455 457 domainDestination->computeLocalMask() ; 456 458 } … … 485 487 // Now extend domain destination 486 488 int niGlob = domainSource->ni_glo; 487 CArray<bool,1>& mask_1d_src = domainSource-> mask_1d;489 CArray<bool,1>& mask_1d_src = domainSource->domainMask; 488 490 CArray<int,1>& i_index_src = domainSource->i_index; 489 491 CArray<double,1>& lon_src = domainSource->lonvalue_1d; … … 508 510 } 509 511 510 CArray<bool,1>& mask_1d_dst = domainDestination-> mask_1d;512 CArray<bool,1>& mask_1d_dst = domainDestination->domainMask; 511 513 CArray<int,1>& i_index_dst = domainDestination->i_index; 512 514 CArray<int,1>& j_index_dst = domainDestination->j_index; … … 665 667 // Update ni 666 668 domainDestination->ni.setValue(newNbLocalDst); 669 domainDestination->mask_1d.resize(domainDestination->domainMask.numElements()) ; 670 domainDestination->mask_1d=domainDestination->domainMask ; 667 671 domainDestination->computeLocalMask() ; 668 672 }
Note: See TracChangeset
for help on using the changeset viewer.