Changeset 1575

Timestamp:

09/10/18 14:21:17 (6 years ago)

Author:

ymipsl

Message:

New functionnalité for parsing expression : new keyword "this_ref" representing the flux of the referenced field tghrough field_ref attribute.
Very close to the "this" keyword, excepted when applied @ operator, freq_op and freq_offset are taking from the referenced field.

YM

File:

• XIOS/trunk/src/parse_expr/filter_expr_node.cpp (modified) (3 diffs)

XIOS/trunk/src/parse_expr/filter_expr_node.cpp

@@ -11 +11 @@
   { /* Nothing to do */ }
 
+  
   std::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
   {
     std::shared_ptr<COutputPin> outputPin;
 
-    if (fieldId == "this")
-      outputPin = thisField.getSelfReference(gc);
-    else if (CField::has(fieldId))
+    if (fieldId == "this") outputPin = thisField.getSelfReference(gc);
+    else
     {
-      CField* field = CField::get(fieldId);
-      if (field == &thisField)
-        ERROR("std::shared_ptr<COutputPin> CFilterFieldExprNode::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->getInstantDataFilter();
+      string id ;
+
+      if (fieldId == "this_ref")
+      {
+        if (thisField.field_ref.isEmpty())
+        {
+          ERROR("shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+                << "field_ref attribute is empty.");
+        }
+        else id = thisField.field_ref ;
+      }
+      else id= fieldId ;
+       
+      if (CField::has(id))
+      {
+        CField* field = CField::get(id);
+        if (field == &thisField)
+          ERROR("shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+                << "The field " << id << " 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->getInstantDataFilter();
+      }
+      else ERROR("boost::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+                  << "The field " << id << " does not exist.");
     }
-    else
-      ERROR("std::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
-            << "The field " << fieldId << " does not exist.");
-
     return outputPin;
   }
+
 
   CFilterTemporalFieldExprNode::CFilterTemporalFieldExprNode(const std::string& fieldId)
@@ -39 +54 @@
   { /* Nothing to do */ }
 
+
   std::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
   {
@@ -45 +61 @@
     if (fieldId == "this")
       outputPin = thisField.getSelfTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
-    else if (CField::has(fieldId))
+    else
     {
-      CField* field = CField::get(fieldId);
-      if (field == &thisField)
-        ERROR("std::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);
+      string id ;
+
+      if (fieldId == "this_ref")
+      {
+        if (thisField.field_ref.isEmpty())
+        {
+          ERROR("shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+                << "field_ref attribute is empty.");
+        }
+        else id = thisField.field_ref ;
+      }
+      else id = fieldId ;
+
+      if (CField::has(id))
+      {
+        CField* field = CField::get(id);
+        if (field == &thisField)
+          ERROR("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
+        ERROR("shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+              << "The field " << fieldId << " does not exist.");
     }
-    else
-      ERROR("std::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
-            << "The field " << fieldId << " does not exist.");
-
     return outputPin;
   }
+
 
   CFilterUnaryOpExprNode::CFilterUnaryOpExprNode(const std::string& opId, IFilterExprNode* child)