Changeset 711 for XIOS/trunk/src/node/context.cpp

Timestamp:

09/29/15 14:17:42 (9 years ago)

Author:

rlacroix

Message:

Support creating the timeseries automatically.

Fields which should be outputted as timeseries must have the ts_enabled attribute set to true.

Files have a new attribute timeseries which must be one of:

• none: no timeseries are outputted, only the regular file (default behavior when the attribute is ommited).
• only: only the timeseries are outputted, the regular file is not created.
• both: both the timeseries and the regular files are outputted.
• exclusive: the timeseries are outputted and a regular file is created with only the fields which were not marked for output as a timeserie (if any).

The name of the files created for the timeseries is composed of a prefix followed by the name of the variable. The file attribute ts_prefix can be used to control the prefix used (by default, the name of the regular file is used).

All the attributes of the regular file are inherited by the files created for the timeseries. The field attribute ts_split_freq can be used to configure the splitting for each timeseries (by default, the splitting frequency of the regular file is used).

File:

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

XIOS/trunk/src/node/context.cpp

@@ -771 +771 @@
       // Warning: This must be done after solving the inheritance and before the rest of post-processing
       checkAxisDomainsGridsEligibilityForCompressedOutput();
+
+      // Check if some automatic time series should be generated
+      // Warning: This must be done after solving the inheritance and before the rest of post-processing
+      prepareTimeseries();
 
       //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers à sortir.
@@ -895 +899 @@
    }
 
+   //! Client side: Prepare the timeseries by adding the necessary files
+   void CContext::prepareTimeseries()
+   {
+     if (!hasClient) return;
+
+     const std::vector<CFile*> allFiles = CFile::getAll();
+     for (size_t i = 0; i < allFiles.size(); i++)
+     {
+       CFile* file = allFiles[i];
+
+       if (!file->timeseries.isEmpty() && file->timeseries != CFile::timeseries_attr::none)
+       {
+         StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : (!file->name.isEmpty() ? file->name : file->getId());
+
+         const std::vector<CField*> allFields = file->getAllFields();
+         for (size_t j = 0; j < allFields.size(); j++)
+         {
+           CField* field = allFields[j];
+
+           if (!field->ts_enabled.isEmpty() && field->ts_enabled)
+           {
+             CFile* tsFile = CFile::create();
+             tsFile->duplicateAttributes(file);
+
+             tsFile->name = tsPrefix + "_";
+             if (!field->name.isEmpty())
+               tsFile->name.get() += field->name;
+             else if (field->hasDirectFieldReference()) // We cannot use getBaseFieldReference() just yet
+               tsFile->name.get() += field->field_ref;
+             else
+               tsFile->name.get() += field->getId();
+
+             if (!field->ts_split_freq.isEmpty())
+               tsFile->split_freq = field->ts_split_freq;
+
+             CField* tsField = tsFile->addField();
+             tsField->field_ref = field->getId();
+
+             tsFile->solveFieldRefInheritance(true);
+
+             if (file->timeseries == CFile::timeseries_attr::exclusive)
+               field->enabled = false;
+           }
+         }
+
+         // Finally disable the original file is need be
+         if (file->timeseries == CFile::timeseries_attr::only)
+          file->enabled = false;
+       }
+     }
+   }
+
    //! Client side: Send information of reference grid of active fields
    void CContext::sendRefGrid()