Changeset 1566
- Timestamp:
- 08/06/18 17:41:50 (6 years ago)
- Location:
- XIOS
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/branchs/xios-2.5/src/node/axis.cpp
r1421 r1566 1283 1283 globalLocalIndexMap_.rehash(std::ceil(index.numElements()/globalLocalIndexMap_.max_load_factor())); 1284 1284 nbIndexGlob = 0; 1285 int nbIndLoc = 0; 1285 1286 for (idx = 0; idx < nbReceived; ++idx) 1286 1287 { … … 1289 1290 { 1290 1291 gloInd = tmp(ind); 1292 nbIndLoc = (gloInd % n_glo) - begin; 1291 1293 if (0 == globalLocalIndexMap_.count(gloInd)) 1292 1294 { 1293 index(nbInd exGlob) = gloInd % n_glo;1294 globalLocalIndexMap_[gloInd] = nbInd exGlob;1295 index(nbIndLoc) = gloInd % n_glo; 1296 globalLocalIndexMap_[gloInd] = nbIndLoc; 1295 1297 ++nbIndexGlob; 1296 1298 } -
XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp
r1421 r1566 1283 1283 globalLocalIndexMap_.rehash(std::ceil(index.numElements()/globalLocalIndexMap_.max_load_factor())); 1284 1284 nbIndexGlob = 0; 1285 int nbIndLoc = 0; 1285 1286 for (idx = 0; idx < nbReceived; ++idx) 1286 1287 { … … 1289 1290 { 1290 1291 gloInd = tmp(ind); 1292 nbIndLoc = (gloInd % n_glo) - begin; 1291 1293 if (0 == globalLocalIndexMap_.count(gloInd)) 1292 1294 { 1293 index(nbInd exGlob) = gloInd % n_glo;1294 globalLocalIndexMap_[gloInd] = nbInd exGlob;1295 index(nbIndLoc) = gloInd % n_glo; 1296 globalLocalIndexMap_[gloInd] = nbIndLoc; 1295 1297 ++nbIndexGlob; 1296 1298 } -
XIOS/trunk/src/node/axis.cpp
r1561 r1566 792 792 const int begin = serverIndexBegin[*itRank][orderPositionInGrid]; 793 793 const int ni = serverDimensionSizes[*itRank][orderPositionInGrid]; 794 const int end = begin + ni - 1;795 794 796 795 msgs.push_back(CMessage()); 797 796 CMessage& msg = msgs.back(); 798 797 msg << this->getId(); 799 msg << ni << begin << end;798 msg << ni << begin; 800 799 msg << isCompressible_; 801 800 … … 826 825 void CAxis::recvDistributionAttribute(CBufferIn& buffer) 827 826 { 828 int ni_srv, begin_srv , end_srv;829 buffer >> ni_srv >> begin_srv >> end_srv;827 int ni_srv, begin_srv; 828 buffer >> ni_srv >> begin_srv; 830 829 buffer >> isCompressible_; 831 830 … … 1138 1137 globalLocalIndexMap_.rehash(std::ceil(index.numElements()/globalLocalIndexMap_.max_load_factor())); 1139 1138 nbIndexGlob = 0; 1139 int nbIndLoc = 0; 1140 1140 for (idx = 0; idx < nbReceived; ++idx) 1141 1141 { … … 1144 1144 { 1145 1145 gloInd = tmp(ind); 1146 nbIndLoc = (gloInd % n_glo)-begin; 1146 1147 if (0 == globalLocalIndexMap_.count(gloInd)) 1147 1148 { 1148 index(nbInd exGlob) = gloInd % n_glo;1149 globalLocalIndexMap_[gloInd] = nbInd exGlob;1149 index(nbIndLoc) = gloInd % n_glo; 1150 globalLocalIndexMap_[gloInd] = nbIndLoc; 1150 1151 ++nbIndexGlob; 1151 1152 }
Note: See TracChangeset
for help on using the changeset viewer.