Changeset 2028 for XIOS

Timestamp:

02/03/21 17:42:33 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src

Files:

• filter/pass_through_filter.cpp (modified) (1 diff)
• filter/temporal_filter.cpp (modified) (1 diff)
• filter/transform_filter.cpp (modified) (1 diff)
• node/field.hpp (modified) (1 diff)
• transformation/domain_algorithm/domain_algorithm_generate_rectilinear.hpp (modified) (1 diff)
• transformation/domain_algorithm/domain_algorithm_interpolate.hpp (modified) (1 diff)
• workflow_graph.cpp (modified) (4 diffs)
• workflow_graph.hpp (modified) (2 diffs)

XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

@@ -36 +36 @@
       for(int i=0; i<this->graphPackage->filterId; i++)
       {
-        if(  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id  
+        if(CXios::isClient 
+          &&  (*CWorkflowGraph::vectorOfNodes_)[i].label_field_id == this->label_field_id  
           && (*CWorkflowGraph::vectorOfNodes_)[i].timestamp == data[0]->timestamp
-          && CXios::isClient
           && (*CWorkflowGraph::vectorOfNodes_)[i].filter_name == "Pass through filter" )
         {

XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp

@@ -47 +47 @@
         graphCycleCompleted = false;
       }
+      
+      data[0]->graphPackage->currentField = this->graphPackage->inFields[0];
+      std::rotate(this->graphPackage->inFields.begin(), this->graphPackage->inFields.begin() + 1, this->graphPackage->inFields.end());
       
       CWorkflowGraph::addEdge(data[0]->graphPackage->fromFilter, this->graphPackage->filterId, data[0]);

XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

@@ -53 +53 @@
       if(this->graphPackage->show)
       {
-        packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0];
+        //packet->graphPackage->currentField = data[0]->graphPackage->currentField->getDirectFieldReference();//this->graphPackage->inFields[0];
+        packet->graphPackage->currentField = this->graphPackage->inFields[0];
         CWorkflowGraph::addNode("Spatial transform filter "+algorithm->getAlgoName(), 4, false, 1, packet);
         CWorkflowGraph::addEdge(packet->graphPackage->fromFilter, this->graphPackage->filterId, packet);

XIOS/dev/dev_trunk_graph/src/node/field.hpp

@@ -236 +236 @@
           bool isGridCompleted_ = true ;
       public:
-          bool isGridCompleted() { } 
+          bool isGridCompleted() ; 
           void setGridCompleted(void) { isGridCompleted_= true; }
           void unsetGridCompleted(void) { isGridCompleted_ = false ;}

XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_generate_rectilinear.hpp

@@ -35 +35 @@
   static bool registerTrans();
   virtual bool isGenerateTransformation(void) { return true ;}
-
+  virtual StdString getAlgoName() {return "\\ngenerate_rectilinear_domain";}
 protected:
   void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);

XIOS/dev/dev_trunk_graph/src/transformation/domain_algorithm/domain_algorithm_interpolate.hpp

@@ -39 +39 @@
 
   static bool registerTrans();
+  virtual StdString getAlgoName() {return "\\ninterpolate_domain";}
 
 private:

XIOS/dev/dev_trunk_graph/src/workflow_graph.cpp

@@ -4 +4 @@
 namespace xios
 {
-
-  
-
 
   std::vector<graph_node_object> *CWorkflowGraph::vectorOfNodes_ = 0;
   std::vector<graph_edge_object> *CWorkflowGraph::vectorOfEdges_ = 0;
   std::vector<StdString> *CWorkflowGraph::vectorOfContexts_ = 0;
-  
 
   std::vector<graph_node_object> *CWorkflowGraph::vectorOfNodes_srv_ = 0;
@@ -19 +15 @@
   bool CWorkflowGraph::clientGraphBuilt = false;
   bool CWorkflowGraph::serverGraphBuilt = false;
-
-
-
   bool CWorkflowGraph::build_begin = false;
 
@@ -105 +98 @@
       edge_obj.field = packet->graphPackage->currentField;
       edge_obj.show = true;
+      
+      if(vectorOfNodes_->at(from).filter_class == 2) // from pass through filter
+      {
+        edge_obj.label_info = vectorOfNodes_->at(from).label_field_id;
+      }
+      
       for(int i=0; i<vectorOfContexts_->size(); i++)
       {
@@ -273 +272 @@
       outfiles[ctx] << "\"from\":"<<vectorOfEdges_->at(i).from<<","<<std::endl;
       outfiles[ctx] << "\"to\":"<<vectorOfEdges_->at(i).to<<","<<std::endl;
-      if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).field->getId()<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
-      else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+      if(vectorOfEdges_->at(i).label_info != "none")
+      {
+        if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).label_info<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+        else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+      }
+      else
+      {
+        if(vectorOfEdges_->at(i).show) outfiles[ctx] << "\"label\":"<<"\""<<vectorOfEdges_->at(i).field->getId()<<"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+        else outfiles[ctx] << "\"label\":"<<"\"\\n"<<vectorOfEdges_->at(i).date<<"\","<<std::endl;
+      }
       outfiles[ctx] << "\"context\":"<<"\""<<vectorOfEdges_->at(i).context_id<<"\","<<std::endl;
       outfiles[ctx] << "\"attributes\":"<<"\""<<vectorOfEdges_->at(i).attributes<<"\","<<std::endl;

XIOS/dev/dev_trunk_graph/src/workflow_graph.hpp

@@ -55 +55 @@
     int context;
     bool show;
+    StdString label_info;
     
-    graph_edge_object():show(true){}
+    graph_edge_object():show(true), label_info("none"){}
   };
 
@@ -100 +101 @@
       static int  getNodeSize();
 
-
-
-      
-
-
-    private:
-
-      //! List of fields marked for visualizing of their workflow
-      static vector <StdString> fields;
-
-      //! List of connected filters for fields for visualizing of their workflow
-      static vector <StdString> filters;
-
-      //! Fields to filters connectivity
-      static vector <pair<int, int> > fieldsToFilters;
-
-      static void buildStaticWorkflow();
-
-
-
   };