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

Timestamp:

01/22/21 18:35:44 (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) (2 diffs)
• grid.cpp (modified) (4 diffs)
• grid.hpp (modified) (1 diff)

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

@@ -614 +614 @@
         // new
         
-        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid->buildTransformationGraph(gc, false,  gridSrc, detectMissingValues, defaultValue, newGrid, buildGraph_) ;
+        std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid->buildTransformationGraph(gc, false,  gridSrc, detectMissingValues, defaultValue, newGrid, buildGraph_, this) ;
         lastFilter->connectOutput(filters.first, 0);
-        if(buildGraph_)
+        /*if(buildGraph_)
         {
           std::cout<<"============== field "<<this->getId()<<" calls a transformation filter 1 ============== "<<lastFilter<<" _ "<<filters.first<<" ***** "<<CXios::isClient<<std::endl;
@@ -622 +622 @@
           filters.first->graphPackage = new CGraphPackage;
           filters.first->graphPackage->inFields.push_back(this);
-        }
+        }*/
         lastFilter = filters.second;
         gridSrc = newGrid ;

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

@@ -1691 +1691 @@
 
   std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > 
-  CGrid::buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues, double defaultValue, CGrid*& newGrid, bool graphEnabled)
+  CGrid::buildTransformationGraph(CGarbageCollector& gc, bool isSource, CGrid* gridSrc, double detectMissingValues, double defaultValue, CGrid*& newGrid, bool graphEnabled, CField* field)
   TRY
   {
@@ -1714 +1714 @@
     else  
     {
-      cout<<"Create new grid : "<<newId<<endl ;
+      StdString role = CXios::isClient? "Client ": "Server ";
+      cout<<role<<"Create new grid : "<<newId<<endl ;
       newGrid = CGrid::create(newId) ;
       isNewGrid = true ;
@@ -1986 +1987 @@
         shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(gridAlgorithm->createTransformFilter(gc, detectMissingValues, defaultValue)) ;
         outputFilter->connectOutput(transformFilter,0) ;
+        if(graphEnabled)
+        {
+          transformFilter->graphEnabled=true;
+          transformFilter->graphPackage = new CGraphPackage;
+          transformFilter->graphPackage->inFields.push_back(field);
+        }
+        
         vector<string> auxFieldId = algo->getAuxFieldId() ; // better to do that at transformation not algo ??
         int i=1; 
@@ -1994 +2002 @@
           auxField->getInstantDataFilter()->connectOutput(transformFilter,i) ;
           i++ ;
+          
         }
         outputFilter = transformFilter ;

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) ;
+                                                                                  double defaultValue, CGrid*& newGrid, bool graphEnabled=false, CField* field=nullptr) ;
       private:
         CGridAlgorithm* gridAlgorithm_ = nullptr ;