Changeset 772 for XIOS/trunk/src/io

Timestamp:

10/30/15 16:33:49 (8 years ago)

Author:

rlacroix

Message:

Axis/Domain?: Use the new infrastructure to get the output name.

File:

• XIOS/trunk/src/io/nc4_data_output.cpp (modified) (9 diffs)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -71 +71 @@
 
          std::vector<StdString> dim0, dim1;
-         StdString domid     = (!domain->name.isEmpty())
-                             ? domain->name.getValue() : domain->getId();
+         StdString domid = domain->getDomainOutputName();
          StdString appendDomid  = (singleDomain) ? "" : "_"+domid ;
          if (isWrittenDomain(domid)) return ;
@@ -449 +448 @@
 
          std::vector<StdString> dim0, dim1;
-         StdString domid     = (!domain->name.isEmpty())
-                             ? domain->name.getValue() : domain->getId();
+         StdString domid = domain->getDomainOutputName();
          if (isWrittenDomain(domid)) return ;
          else writtenDomains.insert(domid) ;
@@ -637 +635 @@
 
         std::vector<StdString> dims;
-        StdString axisid = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId();
+        StdString axisid = axis->getAxisOutputName();
         if (isWrittenAxis(axisid)) return ;
         else writtenAxis.insert(axisid) ;
@@ -759 +757 @@
              {
                CDomain* domain = CDomain::get(domainList[domainList.size() - idxDomain - 1]);
-               StdString domId = !domain->name.isEmpty() ? domain->name.getValue() : domain->getId();
+               StdString domId = domain->getDomainOutputName();
                StdString appendDomId  = singleDomain ? "" : "_" + domId;
 
@@ -779 +777 @@
              {
                CAxis* axis = CAxis::get(axisList[axisList.size() - idxAxis - 1]);
-               compress << (!axis->name.isEmpty() ? axis->name.getValue() : axis->getId());
+               compress << axis->getAxisOutputName();
                ++idxAxis;
              }
@@ -837 +835 @@
                  continue;
 
-               StdString domId = !domain->name.isEmpty() ? domain->name.getValue() : domain->getId();
+               StdString domId = domain->getDomainOutputName();
                StdString appendDomId  = singleDomain ? "" : "_" + domId;
 
@@ -871 +869 @@
                  continue;
 
-               StdString axisId = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId();
+               StdString axisId = axis->getAxisOutputName();
                varId = axisId + "_points";
                compress = axisId;
@@ -987 +985 @@
            {
              CDomain* domain = CDomain::get(domainList[idxDomain]);
-             StdString domId = !domain->name.isEmpty() ? domain->name.getValue() : domain->getId();
+             StdString domId = domain->getDomainOutputName();
              StdString appendDomId  = singleDomain ? "" : "_" + domId ;
 
@@ -1035 +1033 @@
            {
              CAxis* axis = CAxis::get(axisList[idxAxis]);
-             StdString axisId = !axis->name.isEmpty() ? axis->name.getValue() : axis->getId();
+             StdString axisId = axis->getAxisOutputName();
 
              if (compressedOutput && axis->isCompressible())