Changeset 2193 for XIOS

Timestamp:

07/22/21 14:05:58 (3 years ago)

Author:

yushan

Message:

workflow graph : enable unary and binary arithmetic filters

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• filter/binary_arithmetic_filter.cpp (modified) (7 diffs)
• filter/binary_arithmetic_filter.hpp (modified) (3 diffs)
• filter/temporal_filter.cpp (modified) (3 diffs)
• filter/temporal_filter.hpp (modified) (2 diffs)
• filter/unary_arithmetic_filter.cpp (modified) (3 diffs)
• filter/unary_arithmetic_filter.hpp (modified) (1 diff)
• graph_package.hpp (modified) (1 diff)
• node/field.cpp (modified) (15 diffs)
• parse_expr/filter_expr_node.cpp (modified) (5 diffs)
• workflow_graph.cpp (modified) (9 diffs)
• workflow_graph.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/binary_arithmetic_filter.cpp

@@ -1 +1 @@
 #include "binary_arithmetic_filter.hpp"
+#include "workflow_graph.hpp"
 
 namespace xios
@@ -9 +10 @@
   { /* Nothing to do */ };
 
+  std::pair<int, int> CScalarFieldArithmeticFilter::buildGraph(std::vector<CDataPacketPtr> data)
+  {
+    bool building_graph = this->graphEnabled;
+    int unique_filter_id;
+    bool firstround = true;
+    
+    if(building_graph)
+    {
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        data[0]->graphPackage->fromFilter = -1;
+      }
+
+      if(!CWorkflowGraph::mapHashFilterID_) CWorkflowGraph::mapHashFilterID_ = new std::unordered_map <size_t, int>;
+
+      size_t filterhash = std::hash<StdString>{}(this->graphPackage->inFields[0]->content+to_string(data[0]->timestamp)+this->graphPackage->inFields[0]->getId());
+
+      // first round
+      if(CWorkflowGraph::mapHashFilterID_->find(filterhash) == CWorkflowGraph::mapHashFilterID_->end())
+      {
+        this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+        unique_filter_id = this->graphPackage->filterId;
+        CWorkflowGraph::addNode("Arithmetic filter\\n ("+this->graphPackage->inFields[0]->content+")", 4, false, 0, data[0]);        
+
+        CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+        data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+
+       
+        (*CWorkflowGraph::mapHashFilterID_)[filterhash] = unique_filter_id; 
+        
+      }
+      // not first round
+      else 
+      {
+        unique_filter_id = (*CWorkflowGraph::mapHashFilterID_)[filterhash];
+        if(data[0]->graphPackage->fromFilter != unique_filter_id)
+        {
+          CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, unique_filter_id, data[0]);  
+        }
+      }  
+    }
+
+    return std::make_pair(building_graph, unique_filter_id);
+  }
+
   CDataPacketPtr CScalarFieldArithmeticFilter::apply(std::vector<CDataPacketPtr> data)
   {
@@ -15 +65 @@
     packet->timestamp = data[0]->timestamp;
     packet->status = data[0]->status;
+    
+    std::pair<int, int> graph = buildGraph(data);
+
+    if(std::get<0>(graph))
+    {  
+      packet->graphPackage = new CGraphDataPackage;
+      packet->graphPackage->fromFilter = std::get<1>(graph);
+      packet->graphPackage->currentField = this->graphPackage->inFields[0]; 
+    }
 
     if (packet->status == CDataPacket::NO_ERROR)
@@ -28 +87 @@
   { /* Nothing to do */ };
 
+  std::pair<int, int> CFieldScalarArithmeticFilter::buildGraph(std::vector<CDataPacketPtr> data)
+  {
+    bool building_graph = this->graphEnabled;
+    int unique_filter_id;
+    bool firstround = true;
+
+    if(building_graph)
+    {
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        data[0]->graphPackage->fromFilter = -1;
+      }
+
+      if(!CWorkflowGraph::mapHashFilterID_) CWorkflowGraph::mapHashFilterID_ = new std::unordered_map <size_t, int>;
+
+      size_t filterhash = std::hash<StdString>{}(this->graphPackage->inFields[0]->content+to_string(data[0]->timestamp)+this->graphPackage->inFields[0]->getId());
+
+      // first round
+      if(CWorkflowGraph::mapHashFilterID_->find(filterhash) == CWorkflowGraph::mapHashFilterID_->end())
+      {
+        this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+        unique_filter_id = this->graphPackage->filterId;
+        CWorkflowGraph::addNode("Arithmetic filter\\n ("+this->graphPackage->inFields[0]->content+")", 4, false, 0, data[0]);        
+
+        CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+        data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+
+       
+        (*CWorkflowGraph::mapHashFilterID_)[filterhash] = unique_filter_id; 
+        
+      }
+      // not first round
+      else 
+      {
+        unique_filter_id = (*CWorkflowGraph::mapHashFilterID_)[filterhash];
+        if(data[0]->graphPackage->fromFilter != unique_filter_id)
+        {
+          CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, unique_filter_id, data[0]);  
+        }
+      }  
+    }
+
+    return std::make_pair(building_graph, unique_filter_id);
+  }
+
   CDataPacketPtr CFieldScalarArithmeticFilter::apply(std::vector<CDataPacketPtr> data)
   {
@@ -35 +143 @@
     packet->status = data[0]->status;
 
+    std::pair<int, int> graph = buildGraph(data);
+
+    if(std::get<0>(graph))
+    {  
+      packet->graphPackage = new CGraphDataPackage;
+      packet->graphPackage->fromFilter = std::get<1>(graph);
+      packet->graphPackage->currentField = this->graphPackage->inFields[0]; 
+    }
+
     if (packet->status == CDataPacket::NO_ERROR)
       packet->data.reference(op(data[0]->data, value));
@@ -46 +163 @@
   { /* Nothing to do */ };
 
+  std::pair<int, int> CFieldFieldArithmeticFilter::buildGraph(std::vector<CDataPacketPtr> data)
+  {
+    bool building_graph = this->graphEnabled;
+    int unique_filter_id;
+    bool firstround = true;
+
+    if(building_graph)
+    {
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        data[0]->graphPackage->fromFilter = -1;
+      }
+      if(!data[1]->graphPackage)
+      {
+        data[1]->graphPackage = new CGraphDataPackage;
+        data[1]->graphPackage->currentField = this->graphPackage->inFields[0];
+        data[1]->graphPackage->fromFilter = -1;
+      }
+
+      if(!CWorkflowGraph::mapHashFilterID_) CWorkflowGraph::mapHashFilterID_ = new std::unordered_map <size_t, int>;
+
+      size_t filterhash = std::hash<StdString>{}(this->graphPackage->inFields[0]->content+to_string(data[0]->timestamp)+this->graphPackage->inFields[0]->getId());
+
+      // first round
+      if(CWorkflowGraph::mapHashFilterID_->find(filterhash) == CWorkflowGraph::mapHashFilterID_->end())
+      {
+        this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+        unique_filter_id = this->graphPackage->filterId;
+        CWorkflowGraph::addNode("Arithmetic filter\\n ("+this->graphPackage->inFields[0]->content+")", 4, false, 0, data[0]);        
+
+        CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+        data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+
+        CWorkflowGraph::addEdge(data[1]->graphPackage->fromFilter, this->graphPackage->filterId, data[1]);
+        data[1]->graphPackage->fromFilter = this->graphPackage->filterId;
+        data[1]->graphPackage->currentField = this->graphPackage->inFields[0];
+
+        std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+
+        (*CWorkflowGraph::mapHashFilterID_)[filterhash] = unique_filter_id; 
+        
+      }
+      // not first round
+      else 
+      {
+        unique_filter_id = (*CWorkflowGraph::mapHashFilterID_)[filterhash];
+        if(data[0]->graphPackage->fromFilter != unique_filter_id)
+        {
+          CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, unique_filter_id, data[0]);  
+        }
+        if(data[1]->graphPackage->fromFilter != unique_filter_id)
+        {
+          CWorkflowGraph::addEdge(data[1]->graphPackage->fromFilter, unique_filter_id, data[1]);  
+        }
+      }  
+    }
+
+    return std::make_pair(building_graph, unique_filter_id);
+  }
+
+
   CDataPacketPtr CFieldFieldArithmeticFilter::apply(std::vector<CDataPacketPtr> data)
   {
@@ -51 +232 @@
     packet->date = data[0]->date;
     packet->timestamp = data[0]->timestamp;
+
+    std::pair<int, int> graph = buildGraph(data);
+
+    if(std::get<0>(graph))
+    {  
+      packet->graphPackage = new CGraphDataPackage;
+      packet->graphPackage->fromFilter = std::get<1>(graph);
+      packet->graphPackage->currentField = this->graphPackage->inFields[0]; 
+    }
 
     if (data[0]->status != CDataPacket::NO_ERROR)

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/binary_arithmetic_filter.hpp

@@ -35 +35 @@
        */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data);
+      std::pair<int, int> virtual buildGraph(std::vector<CDataPacketPtr> data);
   }; // class CScalarFieldArithmeticFilter
 
@@ -63 +64 @@
        */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data);
+      std::pair<int, int> virtual buildGraph(std::vector<CDataPacketPtr> data);
   }; // class CFieldScalarArithmeticFilter
 
@@ -89 +91 @@
        */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data);
+      std::pair<int, int> virtual buildGraph(std::vector<CDataPacketPtr> data);
+      
   }; // class CFieldFieldArithmeticFilter
 } // namespace xios

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/temporal_filter.cpp

@@ -30 +30 @@
     , isFirstOperation(true)
     , graphCycleCompleted(true)
+    , temporalOperation(opId)
   {
+  }
+
+  std::string CTemporalFilter::getTemporalOperation()
+  {
+    return this->temporalOperation;
   }
 
@@ -45 +51 @@
       {  
         this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
-        CWorkflowGraph::addNode("Temporal filter", 3, false, 0, data[0]);
+        CWorkflowGraph::addNode("Temporal filter \\n("+getTemporalOperation()+")", 3, false, 0, data[0]);
         graphCycleCompleted = false;
       }
@@ -54 +60 @@
       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_ym/XIOS_COUPLING/src/filter/temporal_filter.hpp

@@ -55 +55 @@
       bool virtual isDataExpected(const CDate& date) const;
       bool graphCycleCompleted;
+      std::string getTemporalOperation();
 
     private:
@@ -73 +74 @@
 //      CDate nextOperationDate; //!< The date of the next operation
       bool isFirstOperation; //!< True before the first operation was been computed
+      const std::string temporalOperation;
   }; // class CTemporalFilter
 } // namespace xios

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/unary_arithmetic_filter.cpp

@@ -1 +1 @@
 #include "unary_arithmetic_filter.hpp"
+#include "workflow_graph.hpp"
+
 
 namespace xios
@@ -8 +10 @@
   { /* Nothing to do */ };
 
+  std::pair<int, int> CUnaryArithmeticFilter::buildGraph(std::vector<CDataPacketPtr> data)
+  {
+    bool building_graph = this->graphEnabled;
+    int unique_filter_id;
+    bool firstround = true;
+    
+    if(building_graph)
+    {
+      if(!data[0]->graphPackage)
+      {
+        data[0]->graphPackage = new CGraphDataPackage;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        data[0]->graphPackage->fromFilter = -1;
+      }
+
+      if(!CWorkflowGraph::mapHashFilterID_) CWorkflowGraph::mapHashFilterID_ = new std::unordered_map <size_t, int>;
+
+      size_t filterhash = std::hash<StdString>{}(this->graphPackage->inFields[0]->content+to_string(data[0]->timestamp)+this->graphPackage->inFields[0]->getId());
+
+      // first round
+      if(CWorkflowGraph::mapHashFilterID_->find(filterhash) == CWorkflowGraph::mapHashFilterID_->end())
+      {
+        this->graphPackage->filterId = CWorkflowGraph::getNodeSize();
+        unique_filter_id = this->graphPackage->filterId;
+        CWorkflowGraph::addNode("Arithmetic filter\\n ("+this->graphPackage->inFields[0]->content+")", 4, false, 0, data[0]);        
+
+        CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);
+        data[0]->graphPackage->fromFilter = this->graphPackage->filterId;
+        data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+        std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
+
+       
+        (*CWorkflowGraph::mapHashFilterID_)[filterhash] = unique_filter_id; 
+        
+      }
+      // not first round
+      else 
+      {
+        unique_filter_id = (*CWorkflowGraph::mapHashFilterID_)[filterhash];
+        if(data[0]->graphPackage->fromFilter != unique_filter_id)
+        {
+          CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, unique_filter_id, data[0]);  
+        }
+      }  
+    }
+
+    return std::make_pair(building_graph, unique_filter_id);
+  }
+
+
   CDataPacketPtr CUnaryArithmeticFilter::apply(std::vector<CDataPacketPtr> data)
   {
@@ -15 +67 @@
     packet->status = data[0]->status;
 
+    std::pair<int, int> graph = buildGraph(data);
+
+    if(std::get<0>(graph))
+    {  
+      packet->graphPackage = new CGraphDataPackage;
+      packet->graphPackage->fromFilter = std::get<1>(graph);
+      packet->graphPackage->currentField = this->graphPackage->inFields[0]; 
+    }
+
     if (packet->status == CDataPacket::NO_ERROR)
       packet->data.reference(op(data[0]->data));

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/unary_arithmetic_filter.hpp

@@ -34 +34 @@
        */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data);
+      std::pair<int, int> virtual buildGraph(std::vector<CDataPacketPtr> data);
   }; // class CUnaryArithmeticFilter
 } // namespace xios

XIOS/dev/dev_ym/XIOS_COUPLING/src/graph_package.hpp

@@ -12 +12 @@
     StdString contextId;
     bool show;
+    std::pair< Time, Time > graphInterval;
 
     CGraphPackage(): show(true) {}

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -559 +559 @@
   {
     if (buildWorkflowGraphDone_) return true ;
+
     
     const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
     const double defaultValue = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
     bool buildGraph_ = !build_workflow_graph.isEmpty() && build_workflow_graph == true ;
-    info(100)<<"=== Workflow Graph === field id="<<this->getId()<<" build_workflow_graph="<<buildGraph_<<std::endl;
+
     if (!inputFilter) inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc)); 
-     
+    
     if (hasDirectFieldReference())
     {
       CField* fieldRef = getDirectFieldReference();
-      info(100)<<"=== Workflow Graph === fieldRef id="<<fieldRef->getId()<<std::endl;
-
+      
       //------ build_workflow_graph start
       if(buildGraph_)
@@ -580 +580 @@
         this->build_workflow_graph.set(fieldRef->build_workflow_graph);
         buildGraph_ = !build_workflow_graph.isEmpty() && build_workflow_graph == true ;
-        info(100)<<"=== Workflow Graph === field id="<<this->getId()<<" updated build_workflow_graph="<<buildGraph_<<std::endl;
       }
 
       
-      if(buildGraph_) this->build_workflow_graph.set(build_workflow_graph);
+      // if(buildGraph_) this->build_workflow_graph.set(build_workflow_graph);
       //------ build_workflow_graph end
 
@@ -604 +603 @@
       boost::scoped_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0'));
       filterExpr = expr->reduce(gc, *this);
+      
+      
       if (!filterExpr) return false ; // workflow graph cannot be built at this stage
     }
@@ -636 +637 @@
       if(buildGraph_) 
       {
-        info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a transformation filter 2 ============== "<<getDirectFieldReference()->getInstantDataFilter()<<" _ "<<inputFilter<<std::endl;
         inputFilter->graphEnabled=true;
         inputFilter->graphPackage = new CGraphPackage;
@@ -648 +648 @@
       if (hasExpression())
       {
-         if (filterExpr) lastFilter=filterExpr ;
+         if (filterExpr) 
+         {
+           lastFilter=filterExpr ;
+         }
       }
       
@@ -716 +719 @@
     if(buildGraph_) 
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToFileServer  ============== "<<getTemporalDataFilter(gc, fileOut_->output_freq)<<" _ "<<clientToServerStoreFilter_<<std::endl;
       clientToServerStoreFilter_->graphPackage = new CGraphPackage;
       clientToServerStoreFilter_->graphEnabled = true;
@@ -731 +733 @@
     if(buildGraph_) 
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToCouplerOut  ============== "<<instantDataFilter<<" _ "<<clientToServerStoreFilter_<<std::endl;
       clientToServerStoreFilter_->graphPackage = new CGraphPackage;
       clientToServerStoreFilter_->graphEnabled = true;
@@ -753 +754 @@
     if(buildGraph_ ) 
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToModelInput  ============== "<<modelToClientSourceFilter_<<" _ "<<inputFilter<<" ***** "<<std::endl;
       modelToClientSourceFilter_->graphPackage = new CGraphPackage;
       modelToClientSourceFilter_->graphEnabled = true;
@@ -770 +770 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToClientInput  ============== "<<serverFromClientSourceFilter_ << " _ "<<inputFilter<<" ***** "<<std::endl;
       serverFromClientSourceFilter_->graphPackage = new CGraphPackage;
       serverFromClientSourceFilter_->graphEnabled = true;
@@ -789 +788 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToServerInput  ============== "<<clientFromServerSourceFilter_ << " _ "<<inputFilter<<std::endl;
       clientFromServerSourceFilter_->graphPackage = new CGraphPackage;
       clientFromServerSourceFilter_->graphEnabled = true;
@@ -810 +808 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToCouplerIn  ============== "<<clientFromClientSourceFilter_ << " _ "<<inputFilter<<std::endl;
       clientFromClientSourceFilter_->graphPackage = new CGraphPackage;
       clientFromClientSourceFilter_->graphEnabled = true;
@@ -827 +824 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToFileWriter  ============== "<<instantDataFilter << " _ "<<fileWriterStoreFilter_<<std::endl;
       fileWriterStoreFilter_->graphPackage = new CGraphPackage;
       fileWriterStoreFilter_->graphEnabled = true;
@@ -844 +840 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToFileReader  ============== "<<fileReaderSourceFilter_ << " _ "<<inputFilter<<std::endl;
       fileReaderSourceFilter_->graphPackage = new CGraphPackage;
       fileReaderSourceFilter_->graphEnabled = true;
@@ -862 +857 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToModelOutput  ============== "<<instantDataFilter << " _ "<<clientToModelStoreFilter_<<std::endl;
       clientToModelStoreFilter_->graphPackage = new CGraphPackage;
       clientToModelStoreFilter_->graphEnabled = true;
@@ -878 +872 @@
     if(buildGraph_)
     {
-      info(100)<<"=== Workflow Graph === field "<<this->getId()<<" calls a connectToServerToClient  ============== "<<instantDataFilter << " _ "<<serverToClientStoreFilter_<<std::endl;
       serverToClientStoreFilter_->graphPackage = new CGraphPackage;
       serverToClientStoreFilter_->graphEnabled = true;

XIOS/dev/dev_ym/XIOS_COUPLING/src/parse_expr/filter_expr_node.cpp

@@ -41 +41 @@
 
         bool ret=field->buildWorkflowGraph(gc);
+        if(field->build_workflow_graph) thisField.build_workflow_graph.set(field->build_workflow_graph);
         if (ret) outputPin = field->getInstantDataFilter(); // if dependency is complete build the graph other return nullptr
+        
       }
       else ERROR("boost::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
@@ -110 +112 @@
     if (ret) ret->connectOutput(filter, 0);
     else filter.reset() ;
+    
+    const bool buildGraph_ = !(thisField.build_workflow_graph.isEmpty()) && thisField.build_workflow_graph == true ;
+    if(buildGraph_)
+    {
+      filter->graphPackage = new CGraphPackage;
+      filter->graphEnabled = true;
+      filter->graphPackage->inFields.push_back(&thisField);
+    }
+
     return filter;
   }
@@ -130 +141 @@
     if (ret) ret->connectOutput(filter, 0);
     else filter.reset() ;
+    
+    const bool buildGraph_ = !(thisField.build_workflow_graph.isEmpty()) && thisField.build_workflow_graph == true ;
+    if(buildGraph_)
+    {
+      filter->graphPackage = new CGraphPackage;
+      filter->graphEnabled = true;
+      filter->graphPackage->inFields.push_back(&thisField);
+    }
+
     return filter;
   }
@@ -149 +169 @@
     if (ret) ret->connectOutput(filter, 0);
     else filter.reset() ;
+    
+    const bool buildGraph_ = !(thisField.build_workflow_graph.isEmpty()) && thisField.build_workflow_graph == true ;
+    if(buildGraph_)
+    {
+      filter->graphPackage = new CGraphPackage;
+      filter->graphEnabled = true;
+      filter->graphPackage->inFields.push_back(&thisField);
+    }
     return filter;
   }
@@ -173 +201 @@
     }
     else filter.reset() ;
+
+    const bool buildGraph_ = !(thisField.build_workflow_graph.isEmpty()) && thisField.build_workflow_graph == true ;
+    if(buildGraph_)
+    {
+      filter->graphPackage = new CGraphPackage;
+      filter->graphEnabled = true;
+      filter->graphPackage->inFields.push_back(&thisField);
+    }
+
     return filter;
   }

XIOS/dev/dev_ym/XIOS_COUPLING/src/workflow_graph.cpp

@@ -17 +17 @@
   bool CWorkflowGraph::build_begin = false;
 
+  std::unordered_map <size_t, int> *CWorkflowGraph::mapHashFilterID_ = 0;
+  std::unordered_map <size_t, int> *CWorkflowGraph::mapHashFilterID_srv_ = 0;
+
 
   CWorkflowGraph::CWorkflowGraph()
@@ -29 +32 @@
     for(int i=0; i<vectorOfNodes_->size(); i++)
     {
+      std::cout<<"Node["<<i<<"] is "<<(*vectorOfNodes_)[i].filter_name<<std::endl;
       info(100)<<"Node["<<i<<"] is "<<(*vectorOfNodes_)[i].filter_name<<std::endl;
     }
@@ -34 +38 @@
     for(int i=0; i<vectorOfEdges_->size(); i++)
     {
+      std::cout<<"Edge["<<i<<"] from "<<(*vectorOfEdges_)[i].from<<" to "<<(*vectorOfEdges_)[i].to<<std::endl;
       info(100)<<"Edge["<<i<<"] from "<<(*vectorOfEdges_)[i].from<<" to "<<(*vectorOfEdges_)[i].to<<std::endl;
     }
@@ -85 +90 @@
     if(CXios::isClient)
     {
+      // if(vectorOfEdges_&&vectorOfNodes_) outputWorkflowGraph_client_stdout();
+      // std::cout<<"Trying to add an edge from "<<from<<" to "<<to<<std::endl;
       if(!vectorOfEdges_) vectorOfEdges_ = new std::vector<graph_edge_object>;
       std::string currentContextId = CContext::getCurrent()->getId();
@@ -158 +165 @@
     if(CXios::isClient)
     {
+      //if(vectorOfEdges_&&vectorOfNodes_) outputWorkflowGraph_client_stdout();
+      // std::cout<<"Trying to add a node naming "<<filterName<<std::endl;
       if(!vectorOfNodes_) vectorOfNodes_ = new std::vector<graph_node_object>;
       if(!vectorOfContexts_) vectorOfContexts_ = new std::vector<StdString>;
+      if(!mapHashFilterID_) mapHashFilterID_ = new std::unordered_map <size_t, int>;
+
       std::string currentContextId = CContext::getCurrent()->getId();
       if ( std::find(vectorOfContexts_->begin(), vectorOfContexts_->end(), currentContextId) == vectorOfContexts_->end() )
@@ -172 +183 @@
       node_obj.date = packet->date;
       node_obj.timestamp = packet->timestamp;
+      
       for(int i=0; i<vectorOfContexts_->size(); i++)
       {
@@ -181 +193 @@
         }
       }    
+      
       node_obj.attributes = packet->graphPackage->currentField->recordXiosAttributes();
-
+      
       vectorOfNodes_->push_back(node_obj);
-      //info(100)<<"****************** Add node "<<filterName<<std::endl;   
     }
     else
@@ -190 +202 @@
       if(!vectorOfNodes_srv_) vectorOfNodes_srv_ = new std::vector<graph_node_object>;
       if(!vectorOfContexts_srv_) vectorOfContexts_srv_ = new std::vector<StdString>;
+      if(!mapHashFilterID_srv_) mapHashFilterID_srv_ = new std::unordered_map <size_t, int>;
+
       std::string currentContextId = CContext::getCurrent()->getId();
       if ( std::find(vectorOfContexts_srv_->begin(), vectorOfContexts_srv_->end(), currentContextId) == vectorOfContexts_srv_->end() )
@@ -213 +227 @@
 
       vectorOfNodes_srv_->push_back(node_obj);
-      //info(100)<<"******************Server side : Add node "<<filterName<<std::endl; 
     }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/workflow_graph.hpp

@@ -78 +78 @@
       static std::vector<StdString> *vectorOfContexts_srv_; 
 
+      static std::unordered_map <size_t, int> *mapHashFilterID_;
+      static std::unordered_map <size_t, int> *mapHashFilterID_srv_;
+
       // these variables are not yet used
       static bool clientGraphBuilt;