Changeset 1677 for XIOS/dev/dev_trunk_omp/src/parse_expr/filter_expr_node.cpp

Timestamp:

06/25/19 16:14:54 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1663.

File:

• XIOS/dev/dev_trunk_omp/src/parse_expr/filter_expr_node.cpp (modified) (11 diffs)

XIOS/dev/dev_trunk_omp/src/parse_expr/filter_expr_node.cpp

@@ -108 +108 @@
     std::shared_ptr<CUnaryArithmeticFilter> filter(new CUnaryArithmeticFilter(gc, opId));
     child->reduce(gc, thisField)->connectOutput(filter, 0);
+
+    (filter->parent_filters).resize(1);
+    (filter->parent_filters)[0] = child->reduce(gc, thisField);
+
     return filter;
   }
@@ -125 +129 @@
     std::shared_ptr<CScalarFieldArithmeticFilter> filter(new CScalarFieldArithmeticFilter(gc, opId, child1->reduce()));
     child2->reduce(gc, thisField)->connectOutput(filter, 0);
+    
+    (filter->parent_filters).resize(1);
+    (filter->parent_filters)[0] = child2->reduce(gc, thisField);
+
     return filter;
   }
@@ -142 +150 @@
     std::shared_ptr<CFieldScalarArithmeticFilter> filter(new CFieldScalarArithmeticFilter(gc, opId, child2->reduce()));
     child1->reduce(gc, thisField)->connectOutput(filter, 0);
+
+    (filter->parent_filters).resize(1);
+    (filter->parent_filters)[0] = child1->reduce(gc, thisField);
     return filter;
   }
@@ -159 +170 @@
     std::shared_ptr<CFieldFieldArithmeticFilter> filter(new CFieldFieldArithmeticFilter(gc, opId));
     child1->reduce(gc, thisField)->connectOutput(filter, 0);
-    child2->reduce(gc, thisField)->connectOutput(filter, 1);
+    child2->reduce(gc, thisField)->connectOutput(filter, 1); 
+
+    (filter->parent_filters).resize(2);
+    (filter->parent_filters)[0] = child1->reduce(gc, thisField);
+    (filter->parent_filters)[1] = child2->reduce(gc, thisField);
     return filter;
   }
@@ -181 +196 @@
     std::shared_ptr<CScalarScalarFieldArithmeticFilter> filter(new CScalarScalarFieldArithmeticFilter(gc, opId, child1->reduce(),child2->reduce()));
     child3->reduce(gc, thisField)->connectOutput(filter, 0);
+    
+    (filter->parent_filters).resize(1);
+    (filter->parent_filters)[0] = child3->reduce(gc, thisField);
+
     return filter;
   }
@@ -200 +219 @@
     std::shared_ptr<CScalarFieldScalarArithmeticFilter> filter(new CScalarFieldScalarArithmeticFilter(gc, opId, child1->reduce(),child3->reduce()));
     child2->reduce(gc, thisField)->connectOutput(filter, 0);
+
+    (filter->parent_filters).resize(1);
+    (filter->parent_filters)[0] = child2->reduce(gc, thisField);
     return filter;
   }
@@ -220 +242 @@
     child2->reduce(gc, thisField)->connectOutput(filter, 0);
     child3->reduce(gc, thisField)->connectOutput(filter, 1);
+
+    (filter->parent_filters).resize(2);
+    (filter->parent_filters)[0] = child2->reduce(gc, thisField);
+    (filter->parent_filters)[1] = child3->reduce(gc, thisField);
+
     return filter;
   }
@@ -240 +267 @@
     std::shared_ptr<CFieldScalarScalarArithmeticFilter> filter(new CFieldScalarScalarArithmeticFilter(gc, opId, child2->reduce(),child3->reduce()));
     child1->reduce(gc, thisField)->connectOutput(filter, 0);
+
+    (filter->parent_filters).resize(1);
+    (filter->parent_filters)[0] = child1->reduce(gc, thisField);
     return filter;
   }
@@ -261 +291 @@
     child1->reduce(gc, thisField)->connectOutput(filter, 0);
     child3->reduce(gc, thisField)->connectOutput(filter, 1);
+
+    (filter->parent_filters).resize(2);
+    (filter->parent_filters)[0] = child1->reduce(gc, thisField);
+    (filter->parent_filters)[1] = child3->reduce(gc, thisField);
+
     return filter;
   }
@@ -282 +317 @@
     child1->reduce(gc, thisField)->connectOutput(filter, 0);
     child2->reduce(gc, thisField)->connectOutput(filter, 1);
+
+    (filter->parent_filters).resize(2);
+    (filter->parent_filters)[0] = child1->reduce(gc, thisField);
+    (filter->parent_filters)[1] = child2->reduce(gc, thisField);
     return filter;
   }
@@ -303 +342 @@
     child2->reduce(gc, thisField)->connectOutput(filter, 1);
     child3->reduce(gc, thisField)->connectOutput(filter, 2);
+
+    (filter->parent_filters).resize(3);
+    (filter->parent_filters)[0] = child1->reduce(gc, thisField);
+    (filter->parent_filters)[1] = child2->reduce(gc, thisField);
+    (filter->parent_filters)[2] = child3->reduce(gc, thisField);
+
     return filter;
   }