Changeset 2195 for XIOS

Timestamp:

07/22/21 16:23:05 (3 years ago)

Author:

yushan

Message:

workflow graph : enable temporal splitting filter

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter

Files:

• temporal_filter.cpp (modified) (1 diff)
• temporal_transform_filter.cpp (modified) (4 diffs)
• temporal_transform_filter.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/temporal_filter.cpp

@@ -66 +66 @@
 
   }
+  
   CDataPacketPtr CTemporalFilter::apply(std::vector<CDataPacketPtr> data)
   {

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/temporal_transform_filter.cpp

@@ -1 +1 @@
 #include "temporal_transform_filter.hpp"
+#include "workflow_graph.hpp"
 
 namespace xios
@@ -5 +6 @@
 
   CTemporalTransformFilter::CTemporalTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm* algo, int nrecords, bool detectMissingValues, double defaultValue)
-  : CTransformFilter(gc, slots, algo, detectMissingValues, defaultValue), nrecords_(nrecords)
+  : CTransformFilter(gc, slots, algo, detectMissingValues, defaultValue), nrecords_(nrecords), graphCycleCompleted(true)
   {
+  }
+
+  void CTemporalTransformFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data)
+  {
+    if(this->graphEnabled )
+    {
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+      }
+      
+      if(graphCycleCompleted)
+      {  
+        this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+        CWorkflowGraph::addNode("Temporal splitting filter", 7, false, 0, data[0]);
+        graphCycleCompleted = false;
+      }
+      
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+      
+      CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+      data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+    }
 
   }
-
+  
   CDataPacketPtr CTemporalTransformFilter::apply(std::vector<CDataPacketPtr> data)
   {
     if (data[0]->status == CDataPacket::NO_ERROR)
     {
+      buildWorkflowGraph(data);
       if (record_==0) tmpData_.resize(nrecords_) ;
       algorithm_->apply(data[0]->data, tmpData_[record_]);
@@ -27 +55 @@
         packet->status = data[0]->status;
         packet->data.resize(size) ;
+        packet->graphPackage = data[0]->graphPackage;
         double* out = packet->data.dataFirst() ;
         for(auto& it : tmpData_) 
@@ -36 +65 @@
         tmpData_.clear() ;
         record_=0 ;
+        graphCycleCompleted = true;
         return packet ;
       }

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/temporal_transform_filter.hpp

@@ -21 +21 @@
       */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data) ;
+      void buildWorkflowGraph(std::vector<CDataPacketPtr> data);
+      bool graphCycleCompleted;
 //      void apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest);