Changeset 1000 for XIOS/trunk/src

Timestamp:

11/22/16 16:31:11 (7 years ago)

Author:

rlacroix

Message:

Fix handling of arithmetic expression for fields without a field_ref after r998.

Location:

XIOS/trunk/src/node

Files:

• field.cpp (modified) (9 diffs)
• field.hpp (modified) (2 diffs)

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 (hasExpression() || !field_ref.isEmpty())
-       {
-         if (hasExpression())
+       if (hasExpression())
+       {
+         boost::scoped_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0'));
+         boost::shared_ptr<COutputPin> filter = expr->reduce(gc, *this);
+
+         // Check if a spatial transformation is needed
+         if (!field_ref.isEmpty())
          {
-           boost::scoped_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0'));
-           arithmDataFilter = expr->reduce(gc, *this);
+           CGrid* gridRef = CField::get(field_ref)->grid;
+
+           if (grid && grid != gridRef && grid->hasTransform())
+           {
+             double defaultValue = !default_value.isEmpty() ? default_value : 0.0;
+             std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, defaultValue);
+
+             filter->connectOutput(filters.first, 0);
+             filter = filters.second;
+           }
          }
-         // Check if we have a reference on another field
-         if (!field_ref.isEmpty()) instantDataFilter = getFieldReference(gc,arithmDataFilter);
-       }  
+
+         instantDataFilter = filter;
+       }
+       // Check if we have a reference on another field
+       else if (!field_ref.isEmpty())
+         instantDataFilter = getFieldReference(gc);
        // Check if the data is to be read from a file
        else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
@@ -816 +830 @@
     * \return the output pin corresponding to the field reference
     */
-   boost::shared_ptr<COutputPin> CField::getFieldReference(CGarbageCollector& gc, boost::shared_ptr<COutputPin> OutputPin)
+   boost::shared_ptr<COutputPin> CField::getFieldReference(CGarbageCollector& gc)
    {
      if (instantDataFilter || field_ref.isEmpty())
@@ -823 +837 @@
 
      CField* fieldRef = CField::get(field_ref);
-     if (!OutputPin) fieldRef->buildFilterGraph(gc, false);
+     fieldRef->buildFilterGraph(gc, false);
 
      std::pair<boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters;
@@ -829 +843 @@
      if (grid && grid != fieldRef->grid && grid->hasTransform())
      {
-       double defaultValue = 0.0;
-       if (!default_value.isEmpty()) defaultValue = this->default_value;
+       double defaultValue = !default_value.isEmpty() ? default_value : 0.0;
        filters = CSpatialTransformFilter::buildFilterGraph(gc, fieldRef->grid, grid, defaultValue);
      }
-
      else
        filters.first = filters.second = boost::shared_ptr<CFilter>(new CPassThroughFilter(gc));
 
-     if (!OutputPin)   fieldRef->getInstantDataFilter()->connectOutput(filters.first, 0);
-     else OutputPin->connectOutput(filters.first, 0);
+     fieldRef->getInstantDataFilter()->connectOutput(filters.first, 0);
 
      return filters.second;
@@ -854 +865 @@
    boost::shared_ptr<COutputPin> CField::getSelfReference(CGarbageCollector& gc)
    {
-     if (instantDataFilter || ! hasExpression())
+     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.");
@@ -926 +937 @@
   /*!
     * 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.
+    * for the specified operation frequency.
     *
     * \param gc the garbage collector to use
@@ -936 +946 @@
    boost::shared_ptr<COutputPin> CField::getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq)
    {
-     
      if (instantDataFilter || !hasExpression())
        ERROR("COutputPin* CField::getSelfTemporalDataFilter(CGarbageCollector& gc)",
@@ -968 +977 @@
      }
   }
-
-
-/*
-   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) ;
-       }
-  
-    }
-
-*/
 
    //----------------------------------------------------------------
@@ -1425 +1410 @@
     * \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() ;
-     }
+   const 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;
-   }   
+
+   bool CField::hasExpression(void) const
+   {
+     return (!expr.isEmpty() || !content.empty());
+   }
+
    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> OutputPin = boost::shared_ptr<COutputPin>());
+         boost::shared_ptr<COutputPin> getFieldReference(CGarbageCollector& gc);
          boost::shared_ptr<COutputPin> getSelfReference(CGarbageCollector& gc);
          boost::shared_ptr<COutputPin> getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq);
@@ -178 +178 @@
 
         const std::vector<StdString>& getRefDomainAxisIds();
-        string getExpression(void) ;
-        bool hasExpression(void) ;
+
+        const string& getExpression(void);
+        bool hasExpression(void) const;
 
       public: