Changeset 600 for XIOS/trunk/src/node/grid.cpp
- Timestamp:
- 05/27/15 11:03:22 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/grid.cpp
r599 r600 167 167 { 168 168 StdSize retvalue = 1; 169 if (true == scalar_grid.getValue()) return retvalue; 170 std::vector<int> dataNindex = clientDistribution_->getDataNIndex(); 171 172 for (int i = 0; i < dataNindex.size(); ++i) retvalue *= dataNindex[i]; 173 return (retvalue); 169 if (!isScalarGrid()) 170 { 171 std::vector<int> dataNindex = clientDistribution_->getDataNIndex(); 172 for (int i = 0; i < dataNindex.size(); ++i) retvalue *= dataNindex[i]; 173 } 174 return retvalue; 174 175 } 175 176 … … 181 182 std::map<int, size_t >::const_iterator itb = connectedDataSize_.begin(), it, itE = connectedDataSize_.end(); 182 183 183 if ( true == scalar_grid.getValue())184 if (isScalarGrid()) 184 185 { 185 186 for (it = itb; it != itE; ++it) … … 227 228 CContextClient* client=context->client ; 228 229 229 if ( true == scalar_grid)230 if (isScalarGrid()) 230 231 { 231 232 if (context->hasClient) … … 479 480 } 480 481 481 if (domains.empty() && axis.empty()) grid->scalar_grid = true;482 else grid->scalar_grid = false;483 484 482 grid->computeGridGlobalDimension(domains, axis, grid->axis_domain_order); 485 483 … … 723 721 } 724 722 723 bool CGrid::isScalarGrid() const 724 { 725 return (axisList_.empty() && domList_.empty()); 726 } 727 725 728 /*! 726 729 Verify whether one server need to write data … … 757 760 bool CGrid::doGridHaveDataDistributed() 758 761 { 759 if ( true == scalar_grid.getValue()) return false;762 if (isScalarGrid()) return false; 760 763 else 761 764 return isDataDistributed_; … … 775 778 size_t dataSize = 0; 776 779 777 if ( true == scalar_grid)780 if (isScalarGrid()) 778 781 { 779 782 writtenDataSize_ = 1; … … 1242 1245 axis_domain_order(i) = order[i]; 1243 1246 } 1244 scalar_grid = false; 1245 } 1246 else scalar_grid = true; 1247 } 1247 1248 1248 1249 setDomainList();
Note: See TracChangeset
for help on using the changeset viewer.