Changeset 1680 for XIOS/dev/dev_trunk_omp/src/filter/file_writer_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/file_writer_filter.cpp (modified) (2 diffs)

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

@@ -22 +22 @@
   {
     bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph: false;
+    
     if(building_graph)
     {
@@ -27 +28 @@
       int edgeID = InvalidableObject::edgeIdGenerator++;
 
-      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge >;
-      if(CWorkflowGraph::mapFilters_ptr_with_info==0) CWorkflowGraph::mapFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_node>;
+      CWorkflowGraph::allocNodeEdge();
 
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_name = "File Writer Filter";
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 4;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 0;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].expected_entry_nb = 1;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].date = data[0]->date;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].timestamp = data[0]->timestamp;
+      CWorkflowGraph::addNode(this->filterID, "File Writer Filter \\n("+this->field->file->getId()+".nc)", 6, 0, 1, data[0]);
 
-      if(CXios::isClient) std::cout<<"CFileWriterFilter::apply filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
+      // (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->file->recordXiosAttributes();
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->recordXiosAttributes();
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->recordXiosAttributes();
+
+      // if(CXios::isClient) std::cout<<"CFileWriterFilter::apply filter tag = "<<this->tag<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
 
       if(CXios::isClient && CWorkflowGraph::build_begin)