Changeset 2193 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

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

Author:

yushan

Message:

workflow graph : enable unary and binary arithmetic filters

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp (modified) (15 diffs)

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;