Changeset 1680 for XIOS/dev/dev_trunk_omp/src/node

Timestamp:

07/08/19 16:58:12 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1676. Arithmetic filter unified

File:

• XIOS/dev/dev_trunk_omp/src/node/field.cpp (modified) (6 diffs)

XIOS/dev/dev_trunk_omp/src/node/field.cpp

@@ -922 +922 @@
    TRY
    {
+
      CContext* context = CContext::getCurrent();
      bool hasClient = context->hasClient;
@@ -1200 +1201 @@
            {
              CField* fieldRef = CField::get(field_ref);
-             fieldRef->build_workflow_graph.setValue(buildWorkflowGraph);
              CGrid* gridRef = fieldRef->grid;
 
@@ -1236 +1236 @@
          else if (!field_ref.isEmpty())
          {
-           CField::get(field_ref)->build_workflow_graph.setValue(buildWorkflowGraph);
            instantDataFilter = getFieldReference(gc);
            instantDataFilter->tag = buildWorkflowGraph;
@@ -1297 +1296 @@
            fileWriterFilter->end_graph = filter_end;
 
-           std::cout<<"CFileWriterFilter filter start = "<<filter_start<<" end = "<<filter_end<<std::endl;
+           // std::cout<<"CFileWriterFilter filter start = "<<filter_start<<" end = "<<filter_end<<" field = "<<this->getId()<<std::endl;
 
          }
@@ -1368 +1367 @@
        filters.second->parent_filters[0]= fieldRef->getInstantDataFilter();
 
-       filters.second->tag = buildWorkflowGraph || filters.second->parent_filters[0]->tag;
+       filters.second->tag = (buildWorkflowGraph || filters.second->parent_filters[0]->tag);
 
        filters.second->start_graph = filter_start;
@@ -1528 +1527 @@
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && detect_missing_value == true);
-       bool buildWorkflowGraph = buildWorkflowGraph = (!build_workflow_graph.isEmpty() && build_workflow_graph == true);
+       bool buildWorkflowGraph = (!build_workflow_graph.isEmpty() && build_workflow_graph == true);
        std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
                                                                            CContext::getCurrent()->getCalendar()->getInitDate(),