Changeset 1768

Timestamp:

11/14/19 09:57:58 (4 years ago)

Author:

yushan

Message:

trunk : bug fix for workflowgraph

Location:

XIOS/trunk

Files:

• arch/arch-X64_IRENE.env (modified) (1 diff)
• src/filter/binary_arithmetic_filter.cpp (modified) (1 diff)
• src/filter/ternary_arithmetic_filter.cpp (modified) (1 diff)
• src/node/field.cpp (modified) (3 diffs)
• src/parse_expr/filter_expr_node.cpp (modified) (1 diff)
• src/parse_expr/yacc_parser.cpp (modified) (1 diff)

XIOS/trunk/arch/arch-X64_IRENE.env

@@ -1 +1 @@
 module unload netcdf-c netcdf-fortran hdf5 flavor perl hdf5 boost blitz mpi gnu
+#module purge
 module load flavor/hdf5/parallel
 module load netcdf-fortran/4.4.4

XIOS/trunk/src/filter/binary_arithmetic_filter.cpp

@@ -18 +18 @@
   {
     bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false;
-    // bool building_graph = true;
     int unique_filter_id;
     bool firstround;

XIOS/trunk/src/filter/ternary_arithmetic_filter.cpp

@@ -500 +500 @@
   { 
     expression.assign(*yacc_globalInputText_ptr, 0, yacc_globalInputText_ptr->size()-1);
-    std::cout<<"expression = "<<expression;
     /* Nothing to do */ 
   };

XIOS/trunk/src/node/field.cpp

@@ -1451 +1451 @@
    TRY
    {
-     if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl;
+     //if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl;
 
      if (instantDataFilter || !hasExpression())
@@ -1532 +1532 @@
 
        instantDataFilter->connectOutput(temporalFilter, 0);
-       // temporalFilter->tag = buildWorkflowGraph;
+       //temporalFilter->tag = buildWorkflowGraph;
        
        temporalFilter->parent_filters.resize(1);
@@ -1538 +1538 @@
        
 
-       if(temporalFilter->parent_filters[0]->tag) temporalFilter->tag=true;
+       //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;

XIOS/trunk/src/parse_expr/filter_expr_node.cpp

@@ -424 +424 @@
 
     std::shared_ptr<CFieldFieldFieldArithmeticFilter> filter(new CFieldFieldFieldArithmeticFilter(gc, opId));
-    std::cout<<"std::shared_ptr<CFieldFieldFieldArithmeticFilter> filter(new CFieldFieldFieldArithmeticFilter(gc, opId))" <<std::endl;
     ch1->connectOutput(filter, 0);
     ch2->connectOutput(filter, 1);

XIOS/trunk/src/parse_expr/yacc_parser.cpp

@@ -93 +93 @@
     //*yacc_globalInputText_ptr = globalInputText;
 
-    std::cout<<"========= yacc_globalInputText_ptr = "<<*yacc_globalInputText_ptr<<std::endl;
     
     size_t numBytesToRead = maxBytesToRead;