Changeset 741 for XIOS

Timestamp:

10/15/15 15:15:10 (9 years ago)

Author:

rlacroix

Message:

Correctly support expression with the "this" keyword for fields inside a file in read mode.

File:

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

XIOS/trunk/src/node/field.cpp

@@ -619 +619 @@
      if (enableOutput && !storeFilter && !fileWriterFilter)
      {
-       if (!read_access.isEmpty() && read_access.getValue())
+       if (!read_access.isEmpty() && read_access)
        {
          storeFilter = boost::shared_ptr<CStoreFilter>(new CStoreFilter(gc, CContext::getCurrent(), grid));
@@ -678 +678 @@
      if (!selfReferenceFilter)
      {
-       if (!field_ref.isEmpty())
+       if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
+       {
+         if (!serverSourceFilter)
+           serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(grid));
+
+         selfReferenceFilter = serverSourceFilter;
+       }
+       else if (!field_ref.isEmpty())
          selfReferenceFilter = getFieldReference(gc);
        else