Changeset 1680 for XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_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/spatial_transform_filter.cpp (modified) (4 diffs)

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

@@ -9 +9 @@
 #endif
 #include "workflow_graph.hpp"
+#include "file.hpp"
 namespace xios
 {
@@ -184 +185 @@
     {
       this->filterID = InvalidableObject::filterIdGenerator++;
-      int edgeID = InvalidableObject::edgeIdGenerator++;
-    
-      std::cout<<"CSpatialTransformFilter::apply filter tag = "<<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 = "Spatial Transform Filter";
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_class = 6;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].filter_filled = 1;
-      (*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;
-
-
-      if(CWorkflowGraph::mapFieldToFilters_ptr_with_info==0) CWorkflowGraph::mapFieldToFilters_ptr_with_info = new std::unordered_map <int, graph_info_box_edge >;
+      int edgeID = InvalidableObject::edgeIdGenerator++;    
+
+      CWorkflowGraph::allocNodeEdge();
+
+      CWorkflowGraph::addNode(this->filterID, "Spatial Transform Filter", 4, 1, 1, data[0]);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = field->recordXiosAttributes();
+      if(field->file) (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +field->file->recordXiosAttributes();
+
 
       if(CWorkflowGraph::build_begin)
@@ -229 +221 @@
       if (0 != packet->data.numElements())
         (packet->data)(0) = defaultValue;
-      apply(data[0]->data, packet->data, this->filterID);
+      if(building_graph) apply(data[0]->data, packet->data, this->filterID);
+      else apply(data[0]->data, packet->data);
     }
 
@@ -354 +347 @@
         int srcRank = itRecv->first;
 
-        if(filterID >=0) (*CWorkflowGraph::mapFilters_ptr_with_info)[filterID].transform_type = (*itAlgo)->getName();
+        if(filterID >=0)
+        {
+           (*CWorkflowGraph::mapFilters_ptr_with_info)[filterID].filter_name = (*itAlgo)->getName();
+        } 
         if (srcRank != rank)
         {