Changeset 773 for XIOS/trunk/src/io/nc4_data_output.cpp

Timestamp:

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

Author:

rlacroix

Message:

File/Variable?: Add an helper function to get the output name.

File:

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

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1220 +1220 @@
       void CNc4DataOutput::writeFile_ (CFile* file)
       {
-         StdString filename = (!file->name.isEmpty())
-                            ? file->name.getValue() : file->getId();
+         StdString filename = file->getFileOutputName();
          StdString description = (!file->description.isEmpty())
                                ? file->description.getValue()
@@ -1252 +1251 @@
       void CNc4DataOutput::writeAttribute_ (CVariable* var, const string& fieldId)
       {
-        string name ;
-        if (!var->name.isEmpty()) name=var->name ;
-        else if (var->hasId()) name=var->getId() ;
-        else return ;
+        StdString name = var->getVariableOutputName();
 
         try
@@ -1287 +1283 @@
      void CNc4DataOutput::writeAttribute_ (CVariable* var)
      {
-        string name ;
-        if (!var->name.isEmpty()) name=var->name ;
-        else if (var->hasId()) name=var->getId() ;
-        else return ;
+        StdString name = var->getVariableOutputName();
+
         try
         {