Changeset 1768


Ignore:
Timestamp:
11/14/19 09:57:58 (2 years ago)
Author:
yushan
Message:

trunk : bug fix for workflowgraph

Location:
XIOS/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/arch/arch-X64_IRENE.env

    r1649 r1768  
    11module unload netcdf-c netcdf-fortran hdf5 flavor perl hdf5 boost blitz mpi gnu 
     2#module purge 
    23module load flavor/hdf5/parallel 
    34module load netcdf-fortran/4.4.4 
  • XIOS/trunk/src/filter/binary_arithmetic_filter.cpp

    r1704 r1768  
    1818  { 
    1919    bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false; 
    20     // bool building_graph = true; 
    2120    int unique_filter_id; 
    2221    bool firstround; 
  • XIOS/trunk/src/filter/ternary_arithmetic_filter.cpp

    r1704 r1768  
    500500  {  
    501501    expression.assign(*yacc_globalInputText_ptr, 0, yacc_globalInputText_ptr->size()-1); 
    502     std::cout<<"expression = "<<expression; 
    503502    /* Nothing to do */  
    504503  }; 
  • XIOS/trunk/src/node/field.cpp

    r1704 r1768  
    14511451   TRY 
    14521452   { 
    1453      if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl; 
     1453     //if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl; 
    14541454 
    14551455     if (instantDataFilter || !hasExpression()) 
     
    15321532 
    15331533       instantDataFilter->connectOutput(temporalFilter, 0); 
    1534        // temporalFilter->tag = buildWorkflowGraph; 
     1534       //temporalFilter->tag = buildWorkflowGraph; 
    15351535        
    15361536       temporalFilter->parent_filters.resize(1); 
     
    15381538        
    15391539 
    1540        if(temporalFilter->parent_filters[0]->tag) temporalFilter->tag=true; 
     1540       //if(temporalFilter->parent_filters[0]->tag) temporalFilter->tag=true; 
     1541       temporalFilter->tag = temporalFilter->parent_filters[0]->tag; 
     1542       temporalFilter->start_graph = temporalFilter->parent_filters[0]->start_graph; 
     1543       temporalFilter->end_graph = temporalFilter->parent_filters[0]->end_graph; 
    15411544 
    15421545       // temporalFilter->start_graph = filter_start; 
  • XIOS/trunk/src/parse_expr/filter_expr_node.cpp

    r1704 r1768  
    424424 
    425425    std::shared_ptr<CFieldFieldFieldArithmeticFilter> filter(new CFieldFieldFieldArithmeticFilter(gc, opId)); 
    426     std::cout<<"std::shared_ptr<CFieldFieldFieldArithmeticFilter> filter(new CFieldFieldFieldArithmeticFilter(gc, opId))" <<std::endl; 
    427426    ch1->connectOutput(filter, 0); 
    428427    ch2->connectOutput(filter, 1); 
  • XIOS/trunk/src/parse_expr/yacc_parser.cpp

    r1704 r1768  
    9393    //*yacc_globalInputText_ptr = globalInputText; 
    9494 
    95     std::cout<<"========= yacc_globalInputText_ptr = "<<*yacc_globalInputText_ptr<<std::endl; 
    9695     
    9796    size_t numBytesToRead = maxBytesToRead; 
Note: See TracChangeset for help on using the changeset viewer.