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

Timestamp:

02/01/21 11:54:16 (3 years ago)

Author:

yushan

Message:

Graph intermediate commit to a tmp branch.

Location:

XIOS/dev/dev_trunk_graph/src/node

Files:

• field.cpp (modified) (4 diffs)
• grid.cpp (modified) (4 diffs)
• grid.hpp (modified) (1 diff)

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

@@ -554 +554 @@
     {
       inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc)); 
-      if(buildGraph_)
+      /*if(buildGraph_)
       {
         std::cout<<"============== field "<<this->getId()<<" calls a pass through filter ============== "<<inputFilter<<" ***** "<<CXios::isClient<<std::endl;
@@ -560 +560 @@
         inputFilter->graphPackage = new CGraphPackage;
         inputFilter->graphPackage->inFields.push_back(this);
-      }
+      }*/
     }
      
@@ -570 +570 @@
       {
         (*fieldRef).build_workflow_graph.set(build_workflow_graph); 
-        inputFilter->label_field_id = fieldRef->getId(); 
+        //inputFilter->label_field_id = fieldRef->getId(); 
       }    
       else
@@ -642 +642 @@
         inputFilter->graphPackage = new CGraphPackage;
         inputFilter->graphPackage->inFields.push_back(this);
+        inputFilter->label_field_id = getDirectFieldReference()->getId(); 
       }
     }

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

@@ -1694 +1694 @@
   TRY
   {
+    static bool transformationGoing = false;
     registerAlgorithmTransformation() ; // needed to enable self-registration of the transformations
                                         // big mystery why it doesn't work witout that...
@@ -1700 +1701 @@
     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;
+    cout<<"***************CGrid::buildTransformationGraph Pass through filter ***************"<<transformationGoing<<field->getId()<<endl;
+    /*inputFilter->graphEnabled = true;
     inputFilter->graphPackage = new CGraphPackage;
     inputFilter->graphPackage->inFields.push_back(field);
@@ -1995 +1996 @@
           transformFilter->graphPackage = new CGraphPackage;
           transformFilter->graphPackage->inFields.push_back(field);
+          transformFilter->graphPackage->show = !transformationGoing;
         }
         
@@ -2012 +2014 @@
       if (hasRemainTransform)
       {
+        transformationGoing = true;
         gridSrc=newGrid ;
-        pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = this->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid) ;
+        CField *field_bis = field;
+        pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = this->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid, graphEnabled, field_bis) ;
         outputFilter->connectOutput(filters.first,0) ;
         outputFilter=filters.second ;
       }
+      transformationGoing = false;
     }
      

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

@@ -215 +215 @@
       public:
          pair<shared_ptr<CFilter>, shared_ptr<CFilter> > buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues,
-                                                                                  double defaultValue, CGrid*& newGrid, bool graphEnabled=false, CField* field=nullptr) ;
+                                                                                  double defaultValue, CGrid*& newGrid, bool graphEnabled=false, CField* field=0) ;
       private:
         CGridAlgorithm* gridAlgorithm_ = nullptr ;