Changeset 1681 for XIOS/dev/dev_trunk_omp/src/filter/store_filter.cpp

Timestamp:

07/19/19 15:28:33 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Bug fixed

File:

• XIOS/dev/dev_trunk_omp/src/filter/store_filter.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/filter/store_filter.cpp

@@ -89 +89 @@
   template CDataPacket::StatusCode CStoreFilter::getData<7>(Time timestamp, CArray<double, 7>& data);
 
-  void CStoreFilter::onInputReady(std::vector<CDataPacketPtr> data)
+  void CStoreFilter::buildGraph(std::vector<CDataPacketPtr> data)
   {
-
     bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false;
 
@@ -101 +100 @@
       CWorkflowGraph::allocNodeEdge();
  
-      CWorkflowGraph::addNode(this->filterID, "Store Filter", 4, 1, 1, data[0]);
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->recordXiosAttributes();
-      if(this->field->file) (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->recordXiosAttributes();
+      CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 1, 1, data[0]);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
+      if(this->field->file) (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->record4graphXiosAttributes();
 
       // if(CXios::isClient) std::cout<<"CStoreFilter::apply filter tag = "<<this->tag<<std::endl;
@@ -114 +114 @@
       else CWorkflowGraph::build_begin = true;
     }
+  }
 
-
+  void CStoreFilter::onInputReady(std::vector<CDataPacketPtr> data)
+  {
+    buildGraph(data);
 
     CDataPacketPtr packet;