Changeset 641

Timestamp:

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

Author:

rlacroix

Message:

Use the filter infrastructure to handle field references.

Add a pass-through filter to do so.

Location:

XIOS/trunk/src

Files:

• filter/pass_through_filter.cpp (added)
• filter/pass_through_filter.hpp (added)
• node/field.cpp (modified) (3 diffs)
• node/field.hpp (modified) (1 diff)

XIOS/trunk/src/node/field.cpp

@@ -18 +18 @@
 #include "store_filter.hpp"
 #include "file_writer_filter.hpp"
+#include "pass_through_filter.hpp"
 
 namespace xios{
@@ -609 +610 @@
       return(this->last_operation);
    }
+
+   //----------------------------------------------------------------
+
+   boost::shared_ptr<COutputPin> CField::getInstantDataFilter()
+   {
+     return instantDataFilter;
+   }
+
+   //----------------------------------------------------------------
 
    void CField::solveAllReferenceEnabledField(bool doSending2Sever)
@@ -759 +769 @@
    void CField::buildFilterGraph(CGarbageCollector& gc, bool enableOutput)
    {
+     if (!areAllReferenceSolved) solveAllReferenceEnabledField(false);
+
      // Start by building a filter which can provide the field's instant data
      if (!instantDataFilter)
      {
+       // Check if we have a reference on another field
+       if (!field_ref.isEmpty())
+       {
+         boost::shared_ptr<CPassThroughFilter> passThroughFilter(new CPassThroughFilter(gc));
+         instantDataFilter = passThroughFilter;
+         CField* fieldRef = CField::get(field_ref);
+         fieldRef->buildFilterGraph(gc, false);
+         fieldRef->getInstantDataFilter()->connectOutput(passThroughFilter, 0);
+       }
        // Check if the data is to be read from a file
-       if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
+       else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
          instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(grid));
        else // The data might be passed from the model

XIOS/trunk/src/node/field.hpp

@@ -93 +93 @@
          template <int N> void getData(CArray<double, N>& _data) const;
 
+         boost::shared_ptr<COutputPin> getInstantDataFilter();
 
          /// Mutateur ///