Changeset 1091 for XIOS/trunk

Timestamp:

04/12/17 19:05:14 (7 years ago)

Author:

ymipsl

Message:

Enhancement : in file attribut ts_prefix, the substring "%file_name%", if found, is replaced by the file name.
(untested for now)

YM

File:

• XIOS/trunk/src/node/context.cpp (modified) (2 diffs)

XIOS/trunk/src/node/context.cpp

@@ -1018 +1018 @@
        if (!file->timeseries.isEmpty() && file->timeseries != CFile::timeseries_attr::none)
        {
-         StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : file->getFileOutputName();
-
+         StdString fileNameStr("%file_name%") ;
+         StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : fileNameStr ;
+         
+         StdString fileName=file->getFileOutputName();
+         size_t pos=tsPrefix.find(fileNameStr) ;
+         while (pos!=std::string::npos)
+         {
+           tsPrefix=tsPrefix.replace(pos,fileNameStr.size(),fileName) ;
+           pos=tsPrefix.find(fileNameStr) ;
+         }
+        
          const std::vector<CField*> allFields = file->getAllFields();
          for (size_t j = 0; j < allFields.size(); j++)
@@ -1034 +1043 @@
                tsFile->getVirtualVariableGroup()->addChild(fileVars[k]);
 
+            
              tsFile->name = tsPrefix + "_";
              if (!field->name.isEmpty())