Changeset 827 for XIOS/trunk/src/filter

Timestamp:

03/23/16 16:10:45 (8 years ago)

Author:

mhnguyen

Message:

Implementing dynamic interpolation on axis

+) Change grid transformation to make it more flexible
+) Make some small improvements

Test
+) On Curie
+) All test pass

Location:

XIOS/trunk/src/filter

Files:

• filter.cpp (modified) (1 diff)
• filter.hpp (modified) (1 diff)
• spatial_transform_filter.cpp (modified) (4 diffs)
• spatial_transform_filter.hpp (modified) (2 diffs)

XIOS/trunk/src/filter/filter.cpp

@@ -7 +7 @@
     , COutputPin()
     , engine(engine)
+    , inputSlotCount(inputSlotCount)
   { /* Nothing to do */ }
 

XIOS/trunk/src/filter/filter.hpp

@@ -28 +28 @@
     protected:
       IFilterEngine* engine; //!< The filter engine, might be the filter itself
+      size_t inputSlotCount; //!< Number of slot on filter
 
       /*!

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -6 +6 @@
 namespace xios
 {
-  CSpatialTransformFilter::CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine)
-    : CFilter(gc, 1, engine)
+  CSpatialTransformFilter::CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, size_t inputSlotsCount)
+    : CFilter(gc, inputSlotsCount, engine)
   { /* Nothing to do */ }
 
@@ -24 +24 @@
       CGridTransformation* gridTransformation = destGrid->getTransformations();
       CSpatialTransformFilterEngine* engine = CSpatialTransformFilterEngine::get(destGrid->getTransformations());
-      boost::shared_ptr<CSpatialTransformFilter> filter(new CSpatialTransformFilter(gc, engine));
+      const std::vector<StdString>& auxInputs = gridTransformation->getAuxInputs();
+      size_t inputCount = 1 + (auxInputs.empty() ? 0 : auxInputs.size());
+      boost::shared_ptr<CSpatialTransformFilter> filter(new CSpatialTransformFilter(gc, engine, inputCount));
 
       if (!lastFilter)
@@ -32 +34 @@
 
       firstFilter = filter;
+      for (size_t idx = 0; idx < auxInputs.size(); ++idx)
+      {
+        CField* fieldAuxInput = CField::get(auxInputs[idx]);
+        fieldAuxInput->buildFilterGraph(gc, false);
+        fieldAuxInput->getInstantDataFilter()->connectOutput(firstFilter,idx+1);
+      }
+
       destGrid = gridTransformation->getGridSource();
     }
@@ -74 +83 @@
     if (packet->status == CDataPacket::NO_ERROR)
     {
+      if (1 < data.size())  // Dynamical transformations
+      {
+        std::vector<CArray<double,1>* > dataAuxInputs(data.size()-1);
+        for (size_t idx = 0; idx < dataAuxInputs.size(); ++idx) dataAuxInputs[idx] = &(data[idx+1]->data);
+        gridTransformation->computeAll(dataAuxInputs);
+      }
       packet->data.resize(gridTransformation->getGridDestination()->storeIndex_client.numElements());
       apply(data[0]->data, packet->data);

XIOS/trunk/src/filter/spatial_transform_filter.hpp

@@ -11 +11 @@
 
   /*!
-   * A generic filter with one input slot wrapping any type of spatial transformations.
+   * A generic filter with multiple input slots wrapping any type of spatial transformations.
    */
   class CSpatialTransformFilter : public CFilter
@@ -21 +21 @@
        * \param gc the associated garbage collector
        * \param engine the engine defining the spatial transformation
+       * \param [in] inputSlotsCount number of input, by default there is only one for field src
        */
-      CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine);
+      CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, size_t inputSlotsCount = 1);
 
       /*!