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

Timestamp:

07/17/15 13:58:12 (9 years ago)

Author:

rlacroix

Message:

Start using the filter infrastructure to read and write fields.

Note that currently only the simple cases are working. References and all types of operations are disabled.

File:

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

XIOS/trunk/src/node/context.cpp

@@ -46 +46 @@
 
    //----------------------------------------------------------------
+
    /*!
    \brief Get context group (context root)
@@ -56 +57 @@
    }
 
-
    //----------------------------------------------------------------
+
    /*!
    \brief Get calendar of a context
@@ -68 +69 @@
 
    //----------------------------------------------------------------
+
    /*!
    \brief Set a context with a calendar
@@ -386 +388 @@
     if (hasClient)
     {
+      //this->buildAllExpressionOfEnabledFields();
+      //buildAllExpressionOfFieldsWithReadAccess();
+      this->buildFilterGraphOfEnabledFields();
+      buildFilterGraphOfFieldsWithReadAccess();
       this->solveAllRefOfEnabledFields(true);
-      this->buildAllExpressionOfEnabledFields();
-      buildAllExpressionOfFieldsWithReadAccess();
     }
 
@@ -426 +430 @@
      {
        this->enabledFiles[i]->buildAllExpressionOfEnabledFields();
+     }
+   }
+
+   void CContext::buildFilterGraphOfEnabledFields()
+   {
+     int size = this->enabledFiles.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFiles[i]->buildFilterGraphOfEnabledFields(garbageCollector);
      }
    }
@@ -474 +487 @@
     for (size_t i = 0; i < fieldsWithReadAccess.size(); ++i)
       fieldsWithReadAccess[i]->buildAllExpressionEnabledField();
+  }
+
+  void CContext::buildFilterGraphOfFieldsWithReadAccess()
+  {
+    for (size_t i = 0; i < fieldsWithReadAccess.size(); ++i)
+      fieldsWithReadAccess[i]->buildFilterGraph(garbageCollector, true);
   }