Changeset 1577 for XIOS/dev/dev_olga/src

Timestamp:

09/11/18 10:17:46 (6 years ago)

Author:

oabramkina

Message:

Backporting r1573-r1575 to dev.

Location:

XIOS/dev/dev_olga/src

Files:

• io/nc4_data_input.cpp (modified) (3 diffs)
• node/field.cpp (modified) (1 diff)
• parse_expr/filter_expr_node.cpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/io/nc4_data_input.cpp

@@ -85 +85 @@
               count.push_back(domain->nj);
             }
-            --idx ;
             start.push_back(domain->ibegin);
             count.push_back(domain->ni);
-
-            --idx ;
             --idxDomain;
           }
@@ -97 +94 @@
             start.push_back(axis->begin);
             count.push_back(axis->n);
-            --idx;
+            --idxAxis ;
           }
           else
@@ -106 +103 @@
               count.push_back(1);
             }
-            --idx;
           }
         }

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

@@ -1469 +1469 @@
       CFieldGroup* group = CFieldGroup::get(gref);
       CFieldGroup* owner = CFieldGroup::get(boost::polymorphic_downcast<CFieldGroup*>(this));
-
+      owner->setAttributes(group); // inherite of attributes of group reference
+      
       std::vector<CField*> allChildren  = group->getAllChildren();
       std::vector<CField*>::iterator it = allChildren.begin(), end = allChildren.end();

XIOS/dev/dev_olga/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)