Changeset 772
- Timestamp:
- 10/30/15 16:33:49 (9 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/io/nc4_data_output.cpp
r770 r772 71 71 72 72 std::vector<StdString> dim0, dim1; 73 StdString domid = (!domain->name.isEmpty()) 74 ? domain->name.getValue() : domain->getId(); 73 StdString domid = domain->getDomainOutputName(); 75 74 StdString appendDomid = (singleDomain) ? "" : "_"+domid ; 76 75 if (isWrittenDomain(domid)) return ; … … 449 448 450 449 std::vector<StdString> dim0, dim1; 451 StdString domid = (!domain->name.isEmpty()) 452 ? domain->name.getValue() : domain->getId(); 450 StdString domid = domain->getDomainOutputName(); 453 451 if (isWrittenDomain(domid)) return ; 454 452 else writtenDomains.insert(domid) ; … … 637 635 638 636 std::vector<StdString> dims; 639 StdString axisid = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId();637 StdString axisid = axis->getAxisOutputName(); 640 638 if (isWrittenAxis(axisid)) return ; 641 639 else writtenAxis.insert(axisid) ; … … 759 757 { 760 758 CDomain* domain = CDomain::get(domainList[domainList.size() - idxDomain - 1]); 761 StdString domId = !domain->name.isEmpty() ? domain->name.getValue() : domain->getId();759 StdString domId = domain->getDomainOutputName(); 762 760 StdString appendDomId = singleDomain ? "" : "_" + domId; 763 761 … … 779 777 { 780 778 CAxis* axis = CAxis::get(axisList[axisList.size() - idxAxis - 1]); 781 compress << (!axis->name.isEmpty() ? axis->name.getValue() : axis->getId());779 compress << axis->getAxisOutputName(); 782 780 ++idxAxis; 783 781 } … … 837 835 continue; 838 836 839 StdString domId = !domain->name.isEmpty() ? domain->name.getValue() : domain->getId();837 StdString domId = domain->getDomainOutputName(); 840 838 StdString appendDomId = singleDomain ? "" : "_" + domId; 841 839 … … 871 869 continue; 872 870 873 StdString axisId = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId();871 StdString axisId = axis->getAxisOutputName(); 874 872 varId = axisId + "_points"; 875 873 compress = axisId; … … 987 985 { 988 986 CDomain* domain = CDomain::get(domainList[idxDomain]); 989 StdString domId = !domain->name.isEmpty() ? domain->name.getValue() : domain->getId();987 StdString domId = domain->getDomainOutputName(); 990 988 StdString appendDomId = singleDomain ? "" : "_" + domId ; 991 989 … … 1035 1033 { 1036 1034 CAxis* axis = CAxis::get(axisList[idxAxis]); 1037 StdString axisId = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId();1035 StdString axisId = axis->getAxisOutputName(); 1038 1036 1039 1037 if (compressedOutput && axis->isCompressible()) -
XIOS/trunk/src/node/axis.cpp
r771 r772 891 891 for (size_t i = 0; i < refAxis.size(); ++i) 892 892 refAxis[i]->setTransformations(axis->getAllTransformations()); 893 894 // Try to inherit the id of the referenced object as the axis name895 // when no name was been defined and a defaut id is used.896 if (name.isEmpty())897 {898 static const std::string defId("__axis_undef_id_");899 const std::string& id = getId();900 if (id.size() > defId.size() && id.compare(0, defId.size(), defId) == 0)901 name = axis->getId();902 }903 893 } 904 894 -
XIOS/trunk/src/node/domain.cpp
r764 r772 1829 1829 for (size_t i = 0; i < refDomains.size(); ++i) 1830 1830 refDomains[i]->setTransformations(domain->getAllTransformations()); 1831 1832 // Try to inherit the id of the referenced object as the domain name1833 // when no name was been defined and a defaut id is used.1834 if (name.isEmpty())1835 {1836 static const std::string defId("__domain_undef_id_");1837 const std::string& id = getId();1838 if (id.size() > defId.size() && id.compare(0, defId.size(), defId) == 0)1839 name = domain->getId();1840 }1841 1831 } 1842 1832
Note: See TracChangeset
for help on using the changeset viewer.