Changeset 1680 for XIOS/dev/dev_trunk_omp/src/filter/source_filter.cpp

Timestamp:

07/08/19 16:58:12 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Arithmetic filter unified

File:

• XIOS/dev/dev_trunk_omp/src/filter/source_filter.cpp (modified) (1 diff)

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

@@ -71 +71 @@
       packet->field = this->field;
       
-      
       if(CXios::isClient) std::cout<<"source filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
     
-      if(CWorkflowGraph::mapFilters_ptr_with_info==0) CWorkflowGraph::mapFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_node>;
-
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_name = "Source Filter "+ this->field->getId();
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 1;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 1;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].expected_entry_nb = 0;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].date = date;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].timestamp = packet->timestamp;
-
-      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge>;
+      CWorkflowGraph::allocNodeEdge();
+
+      CWorkflowGraph::addNode(this->filterID, "Source Filter ", 1, 1, 0, packet);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->recordXiosAttributes();
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].field_id = this->field->getId();
 
       CWorkflowGraph::build_begin = true;