Changeset 644

Timestamp:

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

Author:

rlacroix

Message:

Use the filter infrastructure to handle the spatial transformations.

Add a spatial transform filter to do so.

Location:

XIOS/trunk/src

Files:

• filter/spatial_transform_filter.cpp (added)
• filter/spatial_transform_filter.hpp (added)
• node/field.cpp (modified) (5 diffs)

XIOS/trunk/src/node/field.cpp

@@ -22 +22 @@
 #include "lex_parser.hpp"
 #include "temporal_filter.hpp"
+#include "spatial_transform_filter.hpp"
 
 namespace xios{
@@ -629 +630 @@
      {
         areAllReferenceSolved = true;
+
         if (context->hasClient)
         {
           solveRefInheritance(true);
           solveBaseReference();
+          if (hasDirectFieldReference()) getDirectFieldReference()->solveAllReferenceEnabledField(false);
         }
 
@@ -786 +789 @@
        else 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);
+
+         std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters;
+         // Check if a spatial transformation is needed
+         if (!grid_ref.isEmpty() && !fieldRef->grid_ref.isEmpty() && grid_ref.getValue() != fieldRef->grid_ref.getValue())
+           filters = CSpatialTransformFilter::buildFilterGraph(gc, fieldRef->grid, grid);
+         else
+           filters.first = filters.second = boost::shared_ptr<CFilter>(new CPassThroughFilter(gc));
+
+         fieldRef->getInstantDataFilter()->connectOutput(filters.first, 0);
+         instantDataFilter = filters.second;
        }
        // Check if the data is to be read from a file
@@ -975 +985 @@
    void CField::solveTransformedGrid()
    {
-     if (!grid_ref.isEmpty() && (!field_ref.isEmpty()))
+     if (!grid_ref.isEmpty() && hasDirectFieldReference() && !getDirectFieldReference()->grid_ref.isEmpty()
+         && grid_ref.getValue() != getDirectFieldReference()->grid_ref.getValue() && !grid->isTransformed())
+       grid->transformGrid(getDirectFieldReference()->grid);
+
+     /*if (!grid_ref.isEmpty() && (!field_ref.isEmpty()))
      {
        CField* fieldRef  = this;
@@ -1008 +1022 @@
          filterSources_.push_back(fieldRef);
        }
-     }
+     }*/
    }