Changeset 1405 for XIOS/dev/XIOS_DEV_CMIP6

Timestamp:

01/22/18 17:40:41 (6 years ago)

Author:

ymipsl

Message:

Bug fix when using instant filter on a field defined outside a file.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• field.cpp (modified) (6 diffs)
• field.hpp (modified) (1 diff)
• file.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -1073 +1073 @@
          else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
          {
-           checkAttributes();
+           checkTimeAttributes();
            instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true,
                                                                                                        detectMissingValues, defaultValue));
@@ -1160 +1160 @@
          if (!serverSourceFilter)
          {
-           checkAttributes();
+           checkTimeAttributes();
            serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true,
                                                                                    detectMissingValues, defaultValue));
@@ -1208 +1208 @@
                << "An operation must be defined for field \"" << getId() << "\".");
 
-       checkAttributes();
+       checkTimeAttributes(&outFreq);
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
@@ -1247 +1247 @@
                << "An operation must be defined for field \"" << getId() << "\".");
 
-       checkAttributes();
+       checkTimeAttributes(&outFreq);
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
@@ -1649 +1649 @@
     * Check on freq_off and freq_op attributes.
     */
-   void CField::checkAttributes(void)
-   {
-     bool isFieldRead = file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read;
+   void CField::checkTimeAttributes(CDuration* freqOp)
+   {
+     bool isFieldRead  = file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read;
+     bool isFieldWrite = file && ( file->mode.isEmpty() ||  file->mode == CFile::mode_attr::write);
      if (isFieldRead && operation.getValue() != "instant")
-       ERROR("void CField::checkAttributes(void)",
+       ERROR("void CField::checkTimeAttributes(void)",
              << "Unsupported operation for field '" << getFieldOutputName() << "'." << std::endl
              << "Currently only \"instant\" is supported for fields read from file.")
@@ -1660 +1661 @@
      {
        if (operation.getValue() == "instant")
-         freq_op.setValue(file->output_freq.getValue());
+       {
+         if (isFieldRead || isFieldWrite) freq_op.setValue(file->output_freq.getValue());
+         else freq_op=*freqOp ;
+       }
        else
          freq_op.setValue(TimeStep);

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.hpp

@@ -137 +137 @@
 
          /// Vérifications ///
-         void checkAttributes(void);
+         void checkTimeAttributes(CDuration* freqOp=NULL);
 
          void buildFilterGraph(CGarbageCollector& gc, bool enableOutput);

XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp

@@ -1167 +1167 @@
        CField* field = this->enabledFields[i];
        this->sendAddField(field->getId(), client);
-       field->checkAttributes();
+       field->checkTimeAttributes();
        field->sendAllAttributesToServer(client);
        field->sendAddAllVariables(client);