Changeset 710
- Timestamp:
- 09/29/15 14:01:58 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/io/nc4_data_output.cpp
r709 r710 75 75 StdString appendDomid = (singleDomain) ? "" : "_"+domid ; 76 76 if (isWrittenDomain(domid)) return ; 77 else writtenDomains.insert(domid) ; 77 else writtenDomains.insert(domid) ; 78 78 79 79 … … 452 452 ? domain->name.getValue() : domain->getId(); 453 453 if (isWrittenDomain(domid)) return ; 454 else writtenDomains.insert(domid) ; 454 else writtenDomains.insert(domid) ; 455 455 456 456 StdString appendDomid = (singleDomain) ? "" : "_"+domid ; … … 639 639 StdString axisid = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId(); 640 640 if (isWrittenAxis(axisid)) return ; 641 else writtenAxis.insert(axisid) ; 641 else writtenAxis.insert(axisid) ; 642 642 643 643 try … … 1555 1555 start.push_back(domain->getOffsetWrittenIndexes()); 1556 1556 count.push_back(domain->getNumberWrittenIndexes()); 1557 idx -= 2; 1557 1558 } 1558 1559 else 1559 1560 { 1561 if ((domain->type) != CDomain::type_attr::unstructured) 1562 { 1563 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]); 1564 count.push_back(nZoomSizeServer[idx]); 1565 } 1566 --idx; 1560 1567 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]); 1561 1568 count.push_back(nZoomSizeServer[idx]); 1562 start.push_back(nZoomBeginServer[idx - 1] - nZoomBeginGlobal[idx - 1]); 1563 count.push_back(nZoomSizeServer[idx - 1]); 1569 --idx; 1564 1570 } 1565 1566 1571 --idxDomain; 1567 idx -= 2;1568 1572 } 1569 1573 else … … 1606 1610 { 1607 1611 CDomain* domain = CDomain::get(domainList[idxDomain]); 1608 if ( domain->type!= CDomain::type_attr::unstructured)1612 if ((domain->type) != CDomain::type_attr::unstructured) 1609 1613 { 1610 1614 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]); … … 1624 1628 } 1625 1629 } 1626 /*1627 for (int i = numElement - 1; i >= 0; --i)1628 1629 1630 start.reserve(nZoomBeginGlobal.size());1631 count.reserve(nZoomBeginGlobal.size());1632 1633 1634 for (int i = numElement - 1; i >= 0; --i)1635 {1636 if (axisDomainOrder(i))1637 {1638 CDomain* domain = CDomain::get(domainList[idxDomain]);1639 1640 if (CDomain::type_attr::unstructured != domain->type)1641 {1642 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);1643 count.push_back(nZoomSizeServer[idx]);1644 }1645 --idx;1646 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);1647 count.push_back(nZoomSizeServer[idx]);1648 --idx;1649 1650 --idxDomain;1651 //idx -= 2;1652 }1653 else1654 {1655 CAxis* axis = CAxis::get(axisList[idxAxis]);1656 1657 start.push_back(nZoomBeginServer[idx] - nZoomBeginGlobal[idx]);1658 count.push_back(nZoomSizeServer[idx]);1659 1660 --idxAxis;1661 --idx;1662 }1663 }1664 1665 // int ssize = nZoomBeginGlobal.size();1666 //1667 // start.resize(ssize);1668 // count.resize(ssize);1669 //1670 // for (int i = 0; i < ssize; ++i)1671 // {1672 // start[i] = nZoomBeginServer[ssize - i - 1] - nZoomBeginGlobal[ssize - i - 1];1673 // count[i] = nZoomSizeServer[ssize - i - 1];1674 // }1675 1630 } 1676 1631
Note: See TracChangeset
for help on using the changeset viewer.