Changeset 2507 for XIOS3/trunk/src/io/nc4_data_output.cpp
- Timestamp:
- 06/01/23 10:58:08 (13 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS3/trunk/src/io/nc4_data_output.cpp
r2481 r2507 202 202 else bounds_latid = "bounds_"+latName+appendDomid; 203 203 204 SuperClassWriter::addDimension(dimXid, domain->ni );205 SuperClassWriter::addDimension(dimYid, domain->nj );204 SuperClassWriter::addDimension(dimXid, domain->niValue_); 205 SuperClassWriter::addDimension(dimYid, domain->njValue_); 206 206 207 207 if (domain->hasBounds) … … 210 210 if (context->intraCommSize_ > 1) 211 211 { 212 this->writeLocalAttributes(domain->ibegin ,213 domain->ni ,214 domain->jbegin ,215 domain->nj ,212 this->writeLocalAttributes(domain->ibeginValue_, 213 domain->niValue_, 214 domain->jbeginValue_, 215 domain->njValue_, 216 216 appendDomid); 217 217 218 218 if (singleDomain) 219 219 this->writeLocalAttributes_IOIPSL(dimXid, dimYid, 220 domain->ibegin ,221 domain->ni ,222 domain->jbegin ,223 domain->nj ,220 domain->ibeginValue_, 221 domain->niValue_, 222 domain->jbeginValue_, 223 domain->njValue_, 224 224 domain->ni_glo,domain->nj_glo, 225 225 context->intraCommRank_,context->intraCommSize_); … … 373 373 std::vector<StdSize> start(2) ; 374 374 std::vector<StdSize> count(2) ; 375 start[1]=domain->ibegin ;376 start[0]=domain->jbegin ;377 count[1]=domain->ni ; count[0]=domain->nj;375 start[1]=domain->ibeginValue_; 376 start[0]=domain->jbeginValue_; 377 count[1]=domain->niValue_ ; count[0]=domain->njValue_ ; 378 378 379 379 if (domain->hasLonLat) … … 391 391 std::vector<StdSize> count(1) ; 392 392 393 start[0]=domain->jbegin ;394 count[0]=domain->nj ;393 start[0]=domain->jbeginValue_; 394 count[0]=domain->njValue_; 395 395 CArray<double,1> lat; 396 lat.resize( domain->nj .getValue());397 for (int j=0;j<domain->nj .getValue();j++) lat(j) = domain->latvalue(j*domain->ni.getValue());396 lat.resize( domain->njValue_); 397 for (int j=0;j<domain->njValue_;j++) lat(j) = domain->latvalue(j*domain->niValue_); 398 398 SuperClassWriter::writeData(CArray<double,1>(lat.copy()), latid, isCollective, 0,&start,&count); 399 399 400 start[0]=domain->ibegin ;401 count[0]=domain->ni ;402 CArray<double,1> lon = domain->lonvalue(Range(0,domain->ni -1));400 start[0]=domain->ibeginValue_; 401 count[0]=domain->niValue_; 402 CArray<double,1> lon = domain->lonvalue(Range(0,domain->niValue_-1)); 403 403 SuperClassWriter::writeData(CArray<double,1>(lon.copy()), lonid, isCollective, 0,&start,&count); 404 404 } … … 419 419 { 420 420 start[2] = 0; 421 start[1] = domain->ibegin ;422 start[0] = domain->jbegin ;421 start[1] = domain->ibeginValue_; 422 start[0] = domain->jbeginValue_; 423 423 count[2] = domain->nvertex; 424 count[1] = domain->ni ;425 count[0] = domain->nj ;424 count[1] = domain->niValue_; 425 count[0] = domain->njValue_; 426 426 } 427 427 … … 435 435 std::vector<StdSize> count(2); 436 436 437 start[1] = domain->ibegin ;438 start[0] = domain->jbegin ;439 count[1] = domain->ni ;440 count[0] = domain->nj ;437 start[1] = domain->ibeginValue_; 438 start[0] = domain->jbeginValue_; 439 count[1] = domain->niValue_; 440 count[0] = domain->njValue_; 441 441 442 442 SuperClassWriter::writeData(domain->areavalue, areaId, isCollective, 0, &start, &count); … … 703 703 else 704 704 { 705 startNodes[0] = domain->ibegin ;706 countNodes[0] = domain->ni ;705 startNodes[0] = domain->ibeginValue_; 706 countNodes[0] = domain->niValue_ ; 707 707 } 708 708 … … 726 726 else 727 727 { 728 startEdges[0] = domain->ibegin ;729 countEdges[0] = domain->ni ;728 startEdges[0] = domain->ibeginValue_; 729 countEdges[0] = domain->niValue_; 730 730 startNodes[0] = domain->mesh->node_start; 731 731 countNodes[0] = domain->mesh->node_count; 732 732 if (countNodes[0]==0) startNodes[0]=0 ; // for netcdf error 733 startEdgeNodes[0] = domain->ibegin ;733 startEdgeNodes[0] = domain->ibeginValue_; 734 734 startEdgeNodes[1] = 0; 735 countEdgeNodes[0] = domain->ni ;735 countEdgeNodes[0] = domain->niValue_; 736 736 countEdgeNodes[1] = 2; 737 737 } … … 763 763 else 764 764 { 765 startFaces[0] = domain->ibegin ;766 countFaces[0] = domain->ni ;765 startFaces[0] = domain->ibeginValue_; 766 countFaces[0] = domain->niValue_ ; 767 767 startNodes[0] = domain->mesh->node_start; 768 768 countNodes[0] = domain->mesh->node_count; … … 785 785 countEdgeFaces[1]= 2; 786 786 787 startFaceConctv[0] = domain->ibegin ;788 countFaceConctv[0] = domain->ni ;787 startFaceConctv[0] = domain->ibeginValue_; 788 countFaceConctv[0] = domain->niValue_; 789 789 startFaceConctv[1] = 0; 790 790 countFaceConctv[1] = domain->nvertex; … … 998 998 else 999 999 { 1000 start[0]=domain->ibegin ;1001 count[0]=domain->ni ;1002 startBounds[0]=domain->ibegin ;1000 start[0]=domain->ibeginValue_; 1001 count[0]=domain->niValue_; 1002 startBounds[0]=domain->ibeginValue_; 1003 1003 startBounds[1]=0 ; 1004 countBounds[0]=domain->ni ;1004 countBounds[0]=domain->niValue_; 1005 1005 countBounds[1]=nvertex ; 1006 1006 } … … 1110 1110 if (!axis->label.isEmpty() && !SuperClassWriter::dimExist(strId)) SuperClassWriter::addDimension(strId, stringArrayLen); 1111 1111 1112 if (axis->hasValue || !axis->label.isEmpty())1112 if (axis->hasValue() || !axis->label.isEmpty()) 1113 1113 { 1114 1114 if (!axis->label.isEmpty()) dims.push_back(strId); … … 1499 1499 } 1500 1500 1501 firstGlobalIndex = domain->ibegin + domain->jbegin* domain->ni_glo;1501 firstGlobalIndex = domain->ibeginValue_ + domain->jbeginValue_ * domain->ni_glo; 1502 1502 1503 1503 domain->addRelFileCompressed(this->filename); … … 2323 2323 if ((domain->type) != CDomain::type_attr::unstructured) 2324 2324 { 2325 start.push_back(domain->jbegin );2326 count.push_back(domain->nj );2325 start.push_back(domain->jbeginValue_); 2326 count.push_back(domain->njValue_); 2327 2327 } 2328 2328 --idx; 2329 start.push_back(domain->ibegin );2330 count.push_back(domain->ni );2329 start.push_back(domain->ibeginValue_); 2330 count.push_back(domain->niValue_); 2331 2331 --idx; 2332 2332 } … … 2383 2383 if ((domain->type) != CDomain::type_attr::unstructured) 2384 2384 { 2385 start.push_back(domain->jbegin );2386 count.push_back(domain->nj );2385 start.push_back(domain->jbeginValue_); 2386 count.push_back(domain->njValue_); 2387 2387 } 2388 2388 --idx ; 2389 2389 2390 start.push_back(domain->ibegin );2391 count.push_back(domain->ni );2390 start.push_back(domain->ibeginValue_); 2391 count.push_back(domain->niValue_); 2392 2392 --idx ; 2393 2393 --idxDomain;
Note: See TracChangeset
for help on using the changeset viewer.