Changeset 1769


Ignore:
Timestamp:
11/14/19 10:11:34 (2 years ago)
Author:
yushan
Message:

dev_trunk_omp : bug fix for workflowgraph

Location:
XIOS/dev/dev_trunk_omp/src
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_omp/src/filter/binary_arithmetic_filter.cpp

    r1689 r1769  
    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; 
     
    107106  { 
    108107    bool building_graph = this->tag ? data[0]->timestamp >= this->start_graph && data[0]->timestamp <= this->end_graph : false; 
    109     // bool building_graph = true; 
    110108    int unique_filter_id; 
    111109    bool firstround; 
  • XIOS/dev/dev_trunk_omp/src/filter/ternary_arithmetic_filter.cpp

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

    r1689 r1769  
    14581458   TRY 
    14591459   { 
    1460      if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl; 
     1460     //if(CXios::isClient) std::cout<<"getSelfReference field_id = "<<this->getId()<<" start_graph = "<<start_graph<<" end_graph = "<<end_graph<<std::endl; 
    14611461 
    14621462     if (instantDataFilter || !hasExpression()) 
     
    15451545        
    15461546 
    1547        if(temporalFilter->parent_filters[0]->tag) temporalFilter->tag=true; 
     1547      //  if(temporalFilter->parent_filters[0]->tag) temporalFilter->tag=true; 
     1548      temporalFilter->tag = temporalFilter->parent_filters[0]->tag; 
     1549      temporalFilter->start_graph = temporalFilter->parent_filters[0]->start_graph; 
     1550      temporalFilter->end_graph = temporalFilter->parent_filters[0]->end_graph; 
    15481551 
    15491552       // temporalFilter->start_graph = filter_start; 
  • XIOS/dev/dev_trunk_omp/src/parse_expr/filter_expr_node.cpp

    r1681 r1769  
    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/dev/dev_trunk_omp/src/transformation/Functions/average_reduction.cpp

    r1677 r1769  
    3333                                       bool ignoreMissingValue, bool firstPass) 
    3434{ 
    35   std::cout<<"================================ CAverageReductionAlgorithm::apply"<<std::endl; 
    3635  if (resetWeight_) { weights_.resize(flagInitial.size()); weights_ = 1.0; resetWeight_ = false; }   
    3736 
  • XIOS/dev/dev_trunk_omp/src/transformation/Functions/extract.cpp

    r1677 r1769  
    3232                                       bool ignoreMissingValue, bool firstPass) 
    3333{ 
    34   std::cout<<"================================ CExtractReductionAlgorithm::apply"<<std::endl; 
    3534  int nbLocalIndex = localIndex.size(); 
    3635  int currentlocalIndex = 0; 
  • XIOS/dev/dev_trunk_omp/src/transformation/Functions/max_reduction.cpp

    r1677 r1769  
    3333                                   bool ignoreMissingValue, bool firstPass) 
    3434{  
    35   std::cout<<"================================ CMaxReductionAlgorithm::apply"<<std::endl; 
    3635  if (ignoreMissingValue) 
    3736  { 
  • XIOS/dev/dev_trunk_omp/src/transformation/Functions/min_reduction.cpp

    r1677 r1769  
    3333                                   bool ignoreMissingValue, bool firstPass) 
    3434{ 
    35   std::cout<<"================================ CMinReductionAlgorithm::apply"<<std::endl; 
    3635  if (ignoreMissingValue) 
    3736  { 
  • XIOS/dev/dev_trunk_omp/src/transformation/axis_algorithm_extract_domain.cpp

    r1677 r1769  
    8181TRY 
    8282{ 
    83   std::cout<<"================================ CAxisAlgorithmExtractDomain::apply"<<std::endl; 
    8483  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass); 
    8584} 
  • XIOS/dev/dev_trunk_omp/src/transformation/axis_algorithm_reduce_axis.cpp

    r1677 r1769  
    8888TRY 
    8989{ 
    90   std::cout<<"================================ CAxisAlgorithmReduceAxis::apply"<<std::endl; 
    9190  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass); 
    9291} 
  • XIOS/dev/dev_trunk_omp/src/transformation/axis_algorithm_reduce_domain.cpp

    r1677 r1769  
    9191TRY 
    9292{ 
    93   std::cout<<"================================ CAxisAlgorithmReduceDomain::apply"<<std::endl; 
    9493  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass); 
    9594} 
  • XIOS/dev/dev_trunk_omp/src/transformation/domain_algorithm_interpolate.cpp

    r1745 r1769  
    10631063TRY 
    10641064{ 
    1065   std::cout<<"================================ CDomainAlgorithmInterpolate::apply"<<std::endl; 
    10661065  int nbLocalIndex = localIndex.size();    
    10671066  double defaultValue = std::numeric_limits<double>::quiet_NaN(); 
  • XIOS/dev/dev_trunk_omp/src/transformation/scalar_algorithm_extract_axis.cpp

    r1677 r1769  
    6969TRY 
    7070{ 
    71   std::cout<<"================================ CScalarAlgorithmExtractAxis::apply"<<std::endl; 
    7271  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass); 
    7372} 
  • XIOS/dev/dev_trunk_omp/src/transformation/scalar_algorithm_reduce_axis.cpp

    r1677 r1769  
    9898TRY 
    9999{ 
    100   std::cout<<"================================ CScalarAlgorithmTransformation::apply"<<std::endl; 
    101100  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass); 
    102101} 
  • XIOS/dev/dev_trunk_omp/src/transformation/scalar_algorithm_reduce_scalar.cpp

    r1677 r1769  
    9595TRY 
    9696{ 
    97   std::cout<<"================================ CScalarAlgorithmReduceScalar::apply"<<std::endl; 
    9897  reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass); 
    9998} 
  • XIOS/dev/dev_trunk_omp/src/workflow_graph.cpp

    r1681 r1769  
    7777      for (auto it=mapFilters_ptr_with_info->begin(); it != mapFilters_ptr_with_info->end(); it++) 
    7878      { 
    79         // std::cout<<"it->first = "<<it->first<<std::endl; 
    8079        filters[it->first]=it->second.filter_name; 
    8180      } 
Note: See TracChangeset for help on using the changeset viewer.