Changeset 705 for XIOS/trunk/src/io/nc4_data_output.cpp
- Timestamp:
- 09/24/15 09:33:16 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/io/nc4_data_output.cpp
r701 r705 449 449 StdString domid = (!domain->name.isEmpty()) 450 450 ? domain->name.getValue() : domain->getId(); 451 if (isWrittenDomain(domid)) return ; 452 else writtenDomains.insert(domid) ; 453 451 454 StdString appendDomid = (singleDomain) ? "" : "_"+domid ; 452 455 … … 527 530 bounds_latid = StdString("bounds_lat").append(appendDomid); 528 531 dim0.push_back(dimXid); 529 SuperClassWriter::addDimension(dimXid, domain->n j_glo);532 SuperClassWriter::addDimension(dimXid, domain->ni_glo); 530 533 if (domain->hasLonLat) 531 534 { … … 573 576 else 574 577 { 575 start[0]=domain->zoom_ jbegin_srv-domain->global_zoom_jbegin;576 count[0]=domain->zoom_n j_srv ;577 startBounds[0]=domain->zoom_ jbegin_srv-domain->global_zoom_jbegin;578 start[0]=domain->zoom_ibegin_srv-domain->global_zoom_ibegin; 579 count[0]=domain->zoom_ni_srv ; 580 startBounds[0]=domain->zoom_ibegin_srv-domain->global_zoom_ibegin; 578 581 startBounds[1]=0 ; 579 countBounds[0]=domain->zoom_n j_srv ;582 countBounds[0]=domain->zoom_ni_srv ; 580 583 countBounds[1]=domain->nvertex ; 581 584 } … … 633 636 std::vector<StdString> dims; 634 637 StdString axisid = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId(); 638 if (isWrittenAxis(axisid)) return ; 639 else writtenAxis.insert(axisid) ; 640 635 641 try 636 642 { … … 1575 1581 else 1576 1582 { 1583 1584 CArray<bool,1> axisDomainOrder = grid->axis_domain_order; 1585 std::vector<StdString> domainList = grid->getDomainList(); 1586 std::vector<StdString> axisList = grid->getAxisList(); 1587 int numElement = axisDomainOrder.numElements(); 1588 int idxDomain = domainList.size() - 1, idxAxis = axisList.size() - 1; 1589 int idx = nZoomBeginGlobal.size() - 1; 1590 1591 start.reserve(nZoomBeginGlobal.size()); 1592 count.reserve(nZoomBeginGlobal.size()); 1593 1594 for (int i = numElement - 1; i >= 0; --i) 1595 { 1596 if (axisDomainOrder(i)) 1597 { 1598 CDomain* domain = CDomain::get(domainList[idxDomain]); 1599 if (! domain->type == CDomain::type_attr::unstructured) 1600 { 1601 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]); 1602 count.push_back(nZoomSizeServer[idx]); 1603 } 1604 --idx ; 1605 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]); 1606 count.push_back(nZoomSizeServer[idx]); 1607 --idx ; 1608 --idxDomain; 1609 } 1610 else 1611 { 1612 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]); 1613 count.push_back(nZoomSizeServer[idx]); 1614 --idx; 1615 } 1616 } 1617 /* 1577 1618 int ssize = nZoomBeginGlobal.size(); 1619 for (int i = numElement - 1; i >= 0; --i) 1620 1578 1621 1579 1622 start.resize(ssize); … … 1585 1628 count[i] = nZoomSizeServer[ssize - i - 1]; 1586 1629 } 1630 */ 1587 1631 } 1588 1632
Note: See TracChangeset
for help on using the changeset viewer.