Changeset 998

Timestamp:

11/19/16 15:19:36 (8 years ago)

Author:

ymipsl

Message:

• Clarify the situation about filter chaining order between spatial and arithmetics operation :
  • Arithmetic expression is computed first on the source grid
  • Spatial transform is computed after, transforming the result of arithmetics expression on source grid to the target grid.
  • Time filter will be involved on the target grid after spatial transform

• @this is working now.

• Add a field attribute "expr" that is equivalent to the XML content describing the arithmetic expression. This attribute can be inherited.

YM

Location:

XIOS/trunk/src

Files:

• config/field_attribute.conf (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• node/field.cpp (modified) (8 diffs)
• node/field.hpp (modified) (2 diffs)
• node/field_impl.hpp (modified) (1 diff)
• parse_expr/filter_expr_node.cpp (modified) (1 diff)

XIOS/trunk/src/config/field_attribute.conf

@@ -11 +11 @@
 DECLARE_ATTRIBUTE(int,       level)
 DECLARE_ATTRIBUTE(int,       prec)
+DECLARE_ATTRIBUTE(StdString, expr)
 
 DECLARE_ATTRIBUTE(bool,      enabled)

XIOS/trunk/src/context_server.cpp

@@ -184 +184 @@
          // The best way to properly solve this problem will be to use the event scheduler also in attached mode
          // for now just set up a MPI barrier
-         if (!CServer::eventScheduler) MPI_Barrier(intraComm) ;
+         if (!CServer::eventScheduler && CXios::isServer) MPI_Barrier(intraComm) ;
 
          CTimer::get("Process events").resume();

XIOS/trunk/src/node/field.cpp

@@ -768 +768 @@
    {
      if (!areAllReferenceSolved) solveAllReferenceEnabledField(false);
-
      // Start by building a filter which can provide the field's instant data
      if (!instantDataFilter)
      {
+        boost::shared_ptr<COutputPin> arithmDataFilter;
+   
        // Check if we have an expression to parse
-       if (!content.empty())
-       {
-         boost::scoped_ptr<IFilterExprNode> expr(parseExpr(content + '\0'));
-         instantDataFilter = expr->reduce(gc, *this);
-       }
-       // Check if we have a reference on another field
-       else if (!field_ref.isEmpty())
-         instantDataFilter = getFieldReference(gc);
+       if (hasExpression() || !field_ref.isEmpty())
+       {
+         if (hasExpression())
+         {
+           boost::scoped_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0'));
+           arithmDataFilter = expr->reduce(gc, *this);
+         }
+         // Check if we have a reference on another field
+         if (!field_ref.isEmpty()) instantDataFilter = getFieldReference(gc,arithmDataFilter);
+       }  
        // Check if the data is to be read from a file
        else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
@@ -813 +816 @@
     * \return the output pin corresponding to the field reference
     */
-   boost::shared_ptr<COutputPin> CField::getFieldReference(CGarbageCollector& gc)
+   boost::shared_ptr<COutputPin> CField::getFieldReference(CGarbageCollector& gc, boost::shared_ptr<COutputPin> OutputPin)
    {
      if (instantDataFilter || field_ref.isEmpty())
@@ -820 +823 @@
 
      CField* fieldRef = CField::get(field_ref);
-     fieldRef->buildFilterGraph(gc, false);
+     if (!OutputPin) fieldRef->buildFilterGraph(gc, false);
 
      std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters;
@@ -834 +837 @@
        filters.first = filters.second = boost::shared_ptr<CFilter>(new CPassThroughFilter(gc));
 
-     fieldRef->getInstantDataFilter()->connectOutput(filters.first, 0);
+     if (!OutputPin)   fieldRef->getInstantDataFilter()->connectOutput(filters.first, 0);
+     else OutputPin->connectOutput(filters.first, 0);
 
      return filters.second;
@@ -850 +854 @@
    boost::shared_ptr<COutputPin> CField::getSelfReference(CGarbageCollector& gc)
    {
-     if (instantDataFilter || content.empty())
+     if (instantDataFilter || ! hasExpression())
        ERROR("COutputPin* CField::getSelfReference(CGarbageCollector& gc)",
              "Impossible to add a self reference to a field which has already been parsed or which does not have an expression.");
@@ -865 +869 @@
        }
        else if (!field_ref.isEmpty())
-         selfReferenceFilter = getFieldReference(gc);
+       {
+         CField* fieldRef = CField::get(field_ref);
+         fieldRef->buildFilterGraph(gc, false); 
+         selfReferenceFilter = fieldRef->getInstantDataFilter();
+       }
        else
        {
@@ -915 +923 @@
      return it->second;
    }
+
+  /*!
+    * Returns the temporal filter corresponding to the field's temporal operation
+    * for the specified operation frequency. The filter is created if it does not
+    * exist, otherwise it is reused.
+    *
+    * \param gc the garbage collector to use
+    * \param outFreq the operation frequency, i.e. the frequency at which the output data will be computed
+    * \return the output pin corresponding to the requested temporal filter
+    */
+   
+   boost::shared_ptr<COutputPin> CField::getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq)
+   {
+     
+     if (instantDataFilter || !hasExpression())
+       ERROR("COutputPin* CField::getSelfTemporalDataFilter(CGarbageCollector& gc)",
+             "Impossible to add a self reference to a field which has already been parsed or which does not have an expression.");
+
+     if (!selfReferenceFilter) getSelfReference(gc) ;
+
+     if (serverSourceFilter || clientSourceFilter)
+     {
+       if (operation.isEmpty())
+         ERROR("void CField::getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq)",
+               << "An operation must be defined for field \"" << getId() << "\".");
+
+       if (freq_op.isEmpty()) freq_op.setValue(TimeStep);
+       if (freq_offset.isEmpty()) freq_offset.setValue(NoneDu);
+
+       const bool ignoreMissingValue = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
+
+       boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
+                                                                             CContext::getCurrent()->getCalendar()->getInitDate(),
+                                                                             freq_op, freq_offset, outFreq,
+                                                                             ignoreMissingValue, ignoreMissingValue ? default_value : 0.0));
+       selfReferenceFilter->connectOutput(temporalFilter, 0);
+       return temporalFilter ;
+     }
+     else if (!field_ref.isEmpty())
+     {
+       CField* fieldRef = CField::get(field_ref);
+       fieldRef->buildFilterGraph(gc, false); 
+       return fieldRef->getTemporalDataFilter(gc, outFreq) ;
+     }
+  }
+
+
+/*
+   boost::shared_ptr<COutputPin> CField::getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq)
+   {
+
+       if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
+       {
+         if (!serverSourceFilter)
+           serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(grid,
+                                                                                   freq_offset.isEmpty() ? NoneDu : freq_offset));
+
+         selfReferenceFilter = serverSourceFilter;
+       }
+       else if (!field_ref.isEmpty())
+       {   
+          CField* fieldRef = CField::get(field_ref);
+          fieldRef->buildFilterGraph(gc, false);
+          return fieldRef->getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq) ;
+       }
+  
+    }
+
+*/
 
    //----------------------------------------------------------------
@@ -1344 +1421 @@
    }
 
+   /*!
+    * Returns string arithmetic expression associated to the field.
+    * \return if content is defined return content string, otherwise, if "expr" attribute is defined, return expr string.
+    */
+   string CField::getExpression(void)
+   {
+     if (! expr.isEmpty() && content.empty())
+     {
+       content=expr ;
+       expr.reset() ;
+     }
+     return content;
+   }
+   
+   bool CField::hasExpression(void)
+   {
+     if (! expr.isEmpty()) return true ;
+     if (!content.empty()) return true ;
+     return false;
+   }   
    DEFINE_REF_FUNC(Field,field)
 } // namespace xios

XIOS/trunk/src/node/field.hpp

@@ -121 +121 @@
 
          void buildFilterGraph(CGarbageCollector& gc, bool enableOutput);
-         boost::shared_ptr<COutputPin> getFieldReference(CGarbageCollector& gc);
+         boost::shared_ptr<COutputPin> getFieldReference(CGarbageCollector& gc, boost::shared_ptr<COutputPin> OutputPin = boost::shared_ptr<COutputPin>());
          boost::shared_ptr<COutputPin> getSelfReference(CGarbageCollector& gc);
          boost::shared_ptr<COutputPin> getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq);
+         boost::shared_ptr<COutputPin> getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq);
 
 //         virtual void fromBinary(StdIStream& is);
@@ -177 +178 @@
 
         const std::vector<StdString>& getRefDomainAxisIds();
+        string getExpression(void) ;
+        bool hasExpression(void) ;
 
       public:

XIOS/trunk/src/node/field_impl.hpp

@@ -20 +20 @@
     if (clientSourceFilter)
       clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data);
-    else if (!field_ref.isEmpty() || !content.empty())
+    else if (!field_ref.isEmpty() || hasExpression())
       ERROR("void CField::setData(const CArray<double, N>& _data)",
             << "Impossible to receive data from the model for a field [ id = " << getId() << " ] with a reference or an arithmetic operation.");

XIOS/trunk/src/parse_expr/filter_expr_node.cpp

@@ -40 +40 @@
   boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
   {
-    if (!CField::has(fieldId))
+      if (fieldId == "this") return thisField.getSelfTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
+      
+      if (!CField::has(fieldId))
       ERROR("boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
             << "The field " << fieldId << " does not exist.");
 
+      
     CField* field = CField::get(fieldId);
     if (field == &thisField)