Changeset 2023 for XIOS/dev/dev_trunk_graph/src/node

Timestamp:

01/26/21 23:52:07 (4 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src/node

Files:

• field.cpp (modified) (3 diffs)
• grid.cpp (modified) (1 diff)

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

@@ -569 +569 @@
       if(buildGraph_)
       {
-        (*fieldRef).build_workflow_graph.set(build_workflow_graph);  
+        (*fieldRef).build_workflow_graph.set(build_workflow_graph); 
+        inputFilter->label_field_id = fieldRef->getId(); 
       }    
       else
@@ -653 +654 @@
          if (fileIn_->isClientSide()) fileIn_->readFieldAttributesMetaData(this);
          CGrid* newGrid ;
-         std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_) ;
+         std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ;
          grid_ = newGrid ;
          grid_ref=grid_->getId() ; // for server 
@@ -672 +673 @@
         grid_->solveElementsRefInheritance() ;
         CGrid* newGrid ;
-        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_) ;
+        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ;
         newGrid->duplicateAttributes(grid_) ; // for grid attributes (mask)
         grid_ = newGrid ;

XIOS/dev/dev_trunk_graph/src/node/grid.cpp

@@ -1700 +1700 @@
     std::shared_ptr<CFilter> inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc));
     std::shared_ptr<CFilter> outputFilter = inputFilter ;
-
-
+    /*cout<<"***************CGrid::buildTransformationGraph***************"<<field->getId()<<" CGrid::buildTransformationGraph"<<endl;
+    inputFilter->graphEnabled = true;
+    inputFilter->graphPackage = new CGraphPackage;
+    inputFilter->graphPackage->inFields.push_back(field);
+*/
     string newId ;
     if (gridSrc!=nullptr) newId = gridSrc->getId() + " --> " + this->getId()  ;