Changeset 873 for XIOS/trunk/src/node

Timestamp:

06/14/16 16:28:07 (8 years ago)

Author:

mhnguyen

Message:

Masked interpolated points will have default_value (if defined)

+) Default value is used to initialize spatial transform filter
+) Add a new case for testing masked points

Test
+) On Curie
+) All interpolation tests work

File:

• XIOS/trunk/src/node/field.cpp (modified) (3 diffs)

XIOS/trunk/src/node/field.cpp

@@ -289 +289 @@
       cout<<"file->output_freq.getValue() : "<<file->output_freq.getValue()<<endl ;
       cout<<"lastDataRequestedFromServer + file->output_freq.getValue() : "<<lastDataRequestedFromServer + file->output_freq.getValue()<<endl ;
-     
+
       sendReadDataRequest();
     }
@@ -346 +346 @@
           nstepMax = getRelFile()->getDataInput()->getFieldNbRecords(CField::get(this));
         }
-        
+
         this->incrementNStep();
 
@@ -780 +780 @@
      // Check if a spatial transformation is needed
      if (grid && grid != fieldRef->grid && grid->hasTransform())
-       filters = CSpatialTransformFilter::buildFilterGraph(gc, fieldRef->grid, grid);
+     {
+       double defaultValue = 0.0;
+       if (!default_value.isEmpty()) defaultValue = this->default_value;
+       filters = CSpatialTransformFilter::buildFilterGraph(gc, fieldRef->grid, grid, defaultValue);
+     }
+
      else
        filters.first = filters.second = boost::shared_ptr<CFilter>(new CPassThroughFilter(gc));