Changeset 1037 for XIOS/dev/branch_yushan/src/parse_expr/filter_expr_node.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/parse_expr/filter_expr_node.cpp (modified) (1 diff)

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

@@ -40 +40 @@
   boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
   {
-    boost::shared_ptr<COutputPin> outputPin;
-
-    if (fieldId == "this")
-      outputPin = thisField.getSelfTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
-    else if (CField::has(fieldId))
-    {
-      CField* field = CField::get(fieldId);
-      if (field == &thisField)
-        ERROR("boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
-              << "The field " << fieldId << " has an invalid reference to itself. "
-              << "Use the keyword \"this\" if you want to reference the input data sent to this field.");
-
-      field->buildFilterGraph(gc, false);
-      outputPin = field->getTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
-    }
-    else
+    if (!CField::has(fieldId))
       ERROR("boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
             << "The field " << fieldId << " does not exist.");
 
-    return outputPin;
+    CField* field = CField::get(fieldId);
+    if (field == &thisField)
+      ERROR("boost::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+            << "The field " << fieldId << " has an invalid reference to itself.");
+
+    field->buildFilterGraph(gc, false);
+    return field->getTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
   }