Changeset 1876 for XIOS/trunk/src/node

Timestamp:

05/12/20 16:36:29 (4 years ago)

Author:

yushan

Message:

trunk : Bug fixed in workflow graph. wrong connection happens when a chain of arithmetic operations is applied on a field.

File:

• XIOS/trunk/src/node/field.cpp (modified) (15 diffs)

XIOS/trunk/src/node/field.cpp

@@ -26 +26 @@
 #include "workflow_graph.hpp"
 
+#include "yacc_var.hpp"
 namespace xios{
 
@@ -1142 +1143 @@
      if(this->field_graph_end==-2) this->field_graph_end = filter_end;         // init
 
-     // if(CXios::isClient) std::cout<<"****************** buildFilterGraph : field_id = "<<this->getId()<<" BEFORE: this->field_graph_start = "<<this->field_graph_start<<" this->field_graph_end = "<<this->field_graph_end<<std::endl;
 
      if(start_graph == -1)
      {
        //nothing
-       // if(CXios::isClient) std::cout<<"buildFilterGraph field_id = "<<this->getId()<<" case1: this->field_graph_start = "<<this->field_graph_start<<std::endl;
      }
      else //if(start_graph != -1)
@@ -1153 +1152 @@
        if(this->field_graph_start == -1) this->field_graph_start = start_graph;
        else this->field_graph_start = min(this->field_graph_start, start_graph);
-
-       // if(CXios::isClient) std::cout<<"buildFilterGraph field_id = "<<this->getId()<<" case2: this->field_graph_start = "<<this->field_graph_start<<std::endl;
      }
 
@@ -1161 +1158 @@
      {
        //nothing
-       // if(CXios::isClient) std::cout<<"buildFilterGraph field_id = "<<this->getId()<<" case1: this->field_graph_end = "<<this->field_graph_end<<std::endl;
      }
      else
@@ -1168 +1164 @@
        else this->field_graph_end = max(this->field_graph_end, end_graph);
 
-       // if(CXios::isClient) std::cout<<"buildFilterGraph field_id = "<<this->getId()<<" case2: this->field_graph_end = "<<this->field_graph_end<<std::endl;
      }
     
@@ -1175 +1170 @@
      filter_end = this->field_graph_end;
 
-
-     // if(CXios::isClient) std::cout<<"****************** buildFilterGraph : field_id = "<<this->getId()<<" AFTER: this->field_graph_start = "<<this->field_graph_start<<" this->field_graph_end = "<<this->field_graph_end<<std::endl;
-     
-
-     
      
 
@@ -1282 +1272 @@
             instantDataFilter->end_graph = filter_end;
             instantDataFilter->field = this;
-            // if(CXios::isClient) std::cout<<"***********************buildFilterGraph init source filter : field_id = "<<this->getId()<<" sourcefilter->start_graph = "<<clientSourceFilter->start_graph<<" sourcefilter->end_graph = "<<clientSourceFilter->end_graph<<std::endl;
          }
        }
@@ -1320 +1309 @@
            fileWriterFilter->distance = getTemporalDataFilter(gc, file->output_freq)->distance+1;
 
-           // std::cout<<"CFileWriterFilter filter start = "<<filter_start<<" end = "<<filter_end<<" field = "<<this->getId()<<std::endl;
 
          }
@@ -1361 +1349 @@
      if(this->field_graph_end==-2) this->field_graph_end = filter_end;         // init
 
-     // if(CXios::isClient) std::cout<<"getFieldReference field_id = "<<this->getId()<<" BEFORE: this->field_graph_start = "<<this->field_graph_start<<" this->field_graph_end = "<<this->field_graph_end<<std::endl;
 
      if(start_graph == -1)
      {
        //nothing
-       // if(CXios::isClient) std::cout<<"getFieldReference field_id = "<<this->getId()<<" case1: this->field_graph_start = "<<this->field_graph_start<<std::endl;
      }
      else //if(start_graph != -1)
@@ -1372 +1358 @@
        if(this->field_graph_start == -1) this->field_graph_start = start_graph;
        else this->field_graph_start = min(this->field_graph_start, start_graph);
-
-       // if(CXios::isClient) std::cout<<"getFieldReference field_id = "<<this->getId()<<" case2: this->field_graph_start = "<<this->field_graph_start<<std::endl;
      }
 
@@ -1379 +1363 @@
      {
        //nothing
-       // if(CXios::isClient) std::cout<<"getFieldReference field_id = "<<this->getId()<<" case1: this->field_graph_end = "<<this->field_graph_end<<std::endl;
      }
      else
@@ -1385 +1368 @@
        if(this->field_graph_end == -1) this->field_graph_end = end_graph;
        else this->field_graph_end = max(this->field_graph_end, end_graph);
-
-       // if(CXios::isClient) std::cout<<"getFieldReference field_id = "<<this->getId()<<" case2: this->field_graph_end = "<<this->field_graph_end<<std::endl;
      }
 
      filter_start = this->field_graph_start;
      filter_end = this->field_graph_end;
-
-     // if(CXios::isClient) std::cout<<"getFieldReference field_id = "<<this->getId()<<" AFTER: this->field_graph_start = "<<this->field_graph_start<<" this->field_graph_end = "<<this->field_graph_end<<std::endl;
 
 
@@ -1451 +1430 @@
    TRY
    {
-     //if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl;
 
      if (instantDataFilter || !hasExpression())
@@ -1532 +1510 @@
 
        instantDataFilter->connectOutput(temporalFilter, 0);
-       //temporalFilter->tag = buildWorkflowGraph;
        
        temporalFilter->parent_filters.resize(1);
@@ -1538 +1515 @@
        
 
-       //if(temporalFilter->parent_filters[0]->tag) temporalFilter->tag=true;
        temporalFilter->tag = temporalFilter->parent_filters[0]->tag;
        temporalFilter->start_graph = temporalFilter->parent_filters[0]->start_graph;
        temporalFilter->end_graph = temporalFilter->parent_filters[0]->end_graph;
 
-       // temporalFilter->start_graph = filter_start;
-       // temporalFilter->end_graph = filter_end;
        temporalFilter->field = this;