Changeset 2021 for XIOS/dev/dev_trunk_graph/src/filter

Timestamp:

01/22/21 18:35:44 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src/filter

Files:

• client_to_server_store_filter.cpp (modified) (1 diff)
• pass_through_filter.cpp (modified) (2 diffs)
• temporal_filter.cpp (modified) (2 diffs)
• transform_filter.cpp (modified) (3 diffs)
• transform_filter.hpp (modified) (1 diff)

XIOS/dev/dev_trunk_graph/src/filter/client_to_server_store_filter.cpp

@@ -38 +38 @@
       this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
       if(!data[0]->graphPackage) data[0]->graphPackage = new CGraphDataPackage;
-      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      
       std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
-      CWorkflowGraph::addNode("Client to Server Store filter", 5, true, 1, data[0]);
-      
+      CWorkflowGraph::addNode("Client to Server Store filter", 6, true, 1, data[0]);
+     
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
-      data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+      // flux can be redirected to other filters. So don't change the 'from' parameter
+      //data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
     }
   }

XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

@@ -19 +19 @@
     if(this->graphEnabled)
     {
+      if(data[0]->graphPackage->currentField->getId() == this->graphPackage->inFields[0]->getId())
+      {
+        std::cout<<"PASS THROUGH FILTER OMITTED "<<this<<std::endl;
+        std::cout<<data[0]->graphPackage->currentField->getId()<< "-------"<< this->graphPackage->inFields[0]->getId()<<std::endl;
+        return;
+      }
       this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
       
@@ -26 +32 @@
         data[0]->graphPackage->fromFilter = -1;
       }
-          
+      
+      CWorkflowGraph::addNode("Pass through filter", 2, false, 1, data[0]);
       data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
       std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
-      CWorkflowGraph::addNode("Pass through filter", 2, false, 1, data[0]);
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
       data[0]->graphPackage->fromFilter = this->graphPackage->filterId;

XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp

@@ -34 +34 @@
     if(this->graphEnabled)
     {
-      if(!data[0]->graphPackage) data[0]->graphPackage = new CGraphDataPackage;
-      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
-      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+      }
       
       if(this->graphPackage->sourceFilterIds.size()==0)
@@ -46 +47 @@
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
       data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
-      this->graphPackage->sourceFilterIds.push_back(data[0]->graphPackage->fromFilter);    
+      this->graphPackage->sourceFilterIds.push_back(data[0]->graphPackage->fromFilter); 
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
     }
 

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

@@ -1 +1 @@
 #include "transform_filter.hpp"
 #include "grid_algorithm.hpp"
-
+#include "workflow_graph.hpp"
 namespace xios
 {
@@ -19 +19 @@
     packet->timestamp = data[0]->timestamp;
     packet->status = data[0]->status;
-
+    
     if (packet->status == CDataPacket::NO_ERROR) 
     {
+      cout<<"transformeFilter = "<<this<<" and graphEnabled = "<<this->graphEnabled<<std::endl;
+      buildWorkflowGraph(data, packet, algorithm_);
+      
       if (data.size()>1)
       {
@@ -33 +36 @@
   }
 
-
+  void CTransformFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, CGridAlgorithm* algorithm)
+  {
+    if(this->graphEnabled)
+    {
+      this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+    
+      packet->graphPackage = new CGraphDataPackage;
+      if(data[0]->graphPackage)
+      {
+        packet->graphPackage->fromFilter = data[0]->graphPackage->fromFilter;
+      }
+      packet->graphPackage->toFilter = data[0]->graphPackage->toFilter;
+      packet->graphPackage->current_filter_name = data[0]->graphPackage->current_filter_name;
+      packet->graphPackage->contextId = data[0]->graphPackage->contextId;          
+      packet->graphPackage->currentField = data[0]->graphPackage->currentField;//this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+    
+      CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
+      CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);
+      packet->graphPackage->fromFilter = this->graphPackage->filterId;
+      packet->graphPackage->currentField = this->graphPackage->inFields[0];
+    }
+  }
 
 }

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.hpp

@@ -22 +22 @@
       */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data) ;
+      void buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, CGridAlgorithm* algorithm);
+      
 //      void apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest);