Changeset 873 for XIOS

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

Location:

XIOS/trunk

Files:

• inputs/REMAP/iodef.xml (modified) (2 diffs)
• src/filter/spatial_transform_filter.cpp (modified) (8 diffs)
• src/filter/spatial_transform_filter.hpp (modified) (3 diffs)
• src/node/field.cpp (modified) (3 diffs)
• src/test/test_remap.f90 (modified) (4 diffs)
• src/transformation/grid_transformation.cpp (modified) (5 diffs)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -5 +5 @@
    <calendar type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-28 15:00:00 + 1d" />
    <field_definition level="1" >
-     <field id="src_field" operation="instant" domain_ref="src_domain"/>
+     <field id="src_field" operation="instant" domain_ref="src_domain_clone"/>
      <field id="src_field_3D" operation="instant" domain_ref="src_domain" axis_ref="src_axis"/>
      <field id="src_field_3D_interp" operation="instant" field_ref="src_field_3D" axis_ref="dst_axis"/>
@@ -24 +24 @@
    <file_definition type="one_file" par_access="collective" output_freq="1ts" output_level="10" enabled=".TRUE.">
      <file id="output" name="output">
-<!--        <field field_ref="src_field" name="field" />-->
+        <field field_ref="src_field" name="field" />
      </file>
-     <file id="output_3D" name="output_3D">
-        <field field_ref="src_field_3D" name="field" />
+     <file id="output_2D" name="output_2D">
+        <field field_ref="src_field" name="field"  domain_ref="dst_domain_regular_pole" default_value="10.e+5"/>
      </file>
     <file id="output_3D_pression" name="output_3D_pression">

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -6 +6 @@
 namespace xios
 {
-  CSpatialTransformFilter::CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, size_t inputSlotsCount)
-    : CFilter(gc, inputSlotsCount, engine)
+  CSpatialTransformFilter::CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, double outputValue, size_t inputSlotsCount)
+    : CFilter(gc, inputSlotsCount, engine), outputDefaultValue(outputValue)
   { /* Nothing to do */ }
 
   std::pair<boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >
-  CSpatialTransformFilter::buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid)
+  CSpatialTransformFilter::buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, double defaultValue)
   {
     if (!srcGrid || !destGrid)
@@ -26 +26 @@
       const std::vector<StdString>& auxInputs = gridTransformation->getAuxInputs();
       size_t inputCount = 1 + (auxInputs.empty() ? 0 : auxInputs.size());
-      boost::shared_ptr<CSpatialTransformFilter> filter(new CSpatialTransformFilter(gc, engine, inputCount));
+      boost::shared_ptr<CSpatialTransformFilter> filter(new CSpatialTransformFilter(gc, engine, defaultValue, inputCount));
 
       if (!lastFilter)
@@ -48 +48 @@
   }
 
+  void CSpatialTransformFilter::onInputReady(std::vector<CDataPacketPtr> data)
+  {
+    CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine);
+    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue);
+    if (outputPacket)
+      deliverOuput(outputPacket);
+  }
+
   CSpatialTransformFilterEngine::CSpatialTransformFilterEngine(CGridTransformation* gridTransformation)
     : gridTransformation(gridTransformation)
@@ -75 +83 @@
 
   CDataPacketPtr CSpatialTransformFilterEngine::apply(std::vector<CDataPacketPtr> data)
+  {
+    /* Nothing to do */
+  }
+
+  CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue)
   {
     CDataPacketPtr packet(new CDataPacket);
@@ -90 +103 @@
       }
       packet->data.resize(gridTransformation->getGridDestination()->storeIndex_client.numElements());
+      packet->data = defaultValue;
       apply(data[0]->data, packet->data);
     }
@@ -99 +113 @@
   {
     CContextClient* client = CContext::getCurrent()->client;
+
+    // Get default value for output data
+    double defaultValue = 0.0;
+    if (0 != dataDest.numElements()) defaultValue = dataDest(0);
 
     const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource();
     const std::list<CGridTransformation::RecvIndexGridDestinationMap>& listLocalIndexToReceive = gridTransformation->getLocalIndexToReceiveOnGridDest();
     const std::list<size_t>& listNbLocalIndexToReceive = gridTransformation->getNbLocalIndexToReceiveOnGridDest();
+    const std::list<std::vector<bool> >& listLocalIndexMaskOnDest = gridTransformation->getLocalMaskIndexOnGridDest();
 
     CArray<double,1> dataCurrentDest(dataSrc.copy());
@@ -110 +129 @@
     std::list<CGridTransformation::RecvIndexGridDestinationMap>::const_iterator itListRecv = listLocalIndexToReceive.begin();
     std::list<size_t>::const_iterator itNbListRecv = listNbLocalIndexToReceive.begin();
-
-    for (; itListSend != iteListSend; ++itListSend, ++itListRecv, ++itNbListRecv)
+    std::list<std::vector<bool> >::const_iterator itLocalMaskIndexOnDest = listLocalIndexMaskOnDest.begin();
+
+    for (; itListSend != iteListSend; ++itListSend, ++itListRecv, ++itNbListRecv, ++itLocalMaskIndexOnDest)
     {
       CArray<double,1> dataCurrentSrc(dataCurrentDest);
@@ -164 +184 @@
 
       dataCurrentDest.resize(*itNbListRecv);
-      dataCurrentDest = 0.0;
+      const std::vector<bool>& localMaskDest = *itLocalMaskIndexOnDest;
+      for (int i = 0; i < localMaskDest.size(); ++i)
+        if (localMaskDest[i]) dataCurrentDest(i) = 0.0;
+        else dataCurrentDest(i) = defaultValue;
+
       currentBuff = 0;
       for (itRecv = itbRecv; itRecv != iteRecv; ++itRecv)

XIOS/trunk/src/filter/spatial_transform_filter.hpp

@@ -21 +21 @@
        * \param gc the associated garbage collector
        * \param engine the engine defining the spatial transformation
+       * \param outputValue default value of output pin
        * \param [in] inputSlotsCount number of input, by default there is only one for field src
        */
-      CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, size_t inputSlotsCount = 1);
+      CSpatialTransformFilter(CGarbageCollector& gc, CSpatialTransformFilterEngine* engine, double outputValue, size_t inputSlotsCount = 1);
 
       /*!
@@ -34 +35 @@
        */
       static std::pair<boost::shared_ptr<CSpatialTransformFilter>, boost::shared_ptr<CSpatialTransformFilter> >
-      buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid);
+      buildFilterGraph(CGarbageCollector& gc, CGrid* srcGrid, CGrid* destGrid, double defaultValue);
+
+    protected:
+      /*!
+        Overriding this function to process transformations with auxillary inputs
+      */
+      void virtual onInputReady(std::vector<CDataPacketPtr> data);
+
+    protected:
+      //! Default value of output pin
+      double outputDefaultValue;
   }; // class CSpatialTransformFilter
 
@@ -56 +67 @@
        *
        * \param data a vector of packets corresponding to each slot (one in this case)
+       * \param [in] defaultValue default value of output data
+       * \return the result of the grid transformation
+       */
+      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0);
+
+       /*!
+       * Applies the grid transformation to the input data and returns the result.
+       *
+       * \param data a vector of packets corresponding to each slot (one in this case)
        * \return the result of the grid transformation
        */
       CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data);
+
+
 
     protected:

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));

XIOS/trunk/src/test/test_remap.f90

@@ -21 +21 @@
   DOUBLE PRECISION,ALLOCATABLE :: src_boundslat(:,:), dst_boundslat(:,:)
   DOUBLE PRECISION,ALLOCATABLE :: src_field(:), tmp_field(:), tmp_field_1(:), tmp_field_2(:), src_field_3D(:,:), lval(:), lval1(:), src_field_pression(:,:)
+  LOGICAL,ALLOCATABLE :: src_mask_2D(:)
   INTEGER :: src_ni_glo, dst_ni_glo;
   INTEGER :: src_nvertex, dst_nvertex;
@@ -67 +68 @@
   ALLOCATE(src_field(src_ni))
   ALLOCATE(src_field_3D(src_ni,llm))
+  ALLOCATE(src_mask_2D(src_ni))
   ALLOCATE(src_field_pression(src_ni,llm))
   ALLOCATE(lval(llm))
@@ -83 +85 @@
   DO i=1,src_ni
     src_field_3D(i,:) = src_field(i)
+    IF (MOD(i,10)==0) THEN
+      src_mask_2D(i)=.FALSE.
+    ELSE
+      src_mask_2D(i)=.TRUE.
+    ENDIF
   ENDDO
 
@@ -136 +143 @@
   CALL xios_set_domain_attr("src_domain_clone", ni_glo=src_ni_glo, ibegin=src_ibegin, ni=src_ni, type="unstructured")
   CALL xios_set_domain_attr("src_domain_clone", lonvalue_1D=src_lon, latvalue_1D=src_lat, &
-                            bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex)
+                            bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex, &
+                            mask_1d=src_mask_2D)
 
   CALL xios_set_axis_attr("src_axis", n_glo=llm, value=lval)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -438 +438 @@
       std::list<RecvIndexGridDestinationMap>().swap(localIndexToReceiveOnGridDest_);
       std::list<size_t>().swap(nbLocalIndexOnGridDest_);
+      std::list<std::vector<bool> >().swap(localMaskOnGridDest_);
     }
     else
@@ -458 +459 @@
     SourceDestinationIndexMap globaIndexWeightFromSrcToDst;
 
-//    if (1 < nbAlgos_)
-//    {
-//      // Create a temporary grid destination which contains transformed element of grid destination and
-//      // non-transformed elements fo grid source
-////      if (nbAgloTransformation != (nbAlgos_-1)) setUpGridDestination(elementPositionInGrid, transType, nbAgloTransformation);
-//    }
+    // Create a temporary grid destination which contains transformed element of grid destination and
+    // non-transformed elements fo grid source
     setUpGridDestination(elementPositionInGrid, transType, nbAgloTransformation);
 
@@ -512 +509 @@
   // Recalculate the distribution of grid destination
   CDistributionClient distributionClientDest(client->clientRank, tmpGridDestination_);
-//  CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
   CDistributionClient::GlobalLocalDataMap& globalLocalIndexGridDestSendToServer = distributionClientDest.getGlobalLocalDataSendToServer();
-  const std::vector<int>& localMask = distributionClientDest.getLocalMaskIndexOnClient();
 
   // Update number of local index on each transformation
@@ -522 +517 @@
   std::vector<bool>& tmpMask = localMaskOnGridDest_.back();
   tmpMask.resize(nbLocalIndex,false);
-//  for (int idx = 0; idx < nbLocalIndex; ++idx)
-//  {
-//    tmpMask[localMask[idx]] = true;
-//  }
 
   // Find out number of index sent from grid source and number of index received on grid destination
@@ -708 +699 @@
         recvTmp[recvRank][realRecvSize].first = globalLocalIndexGridDestSendToServer[recvIndexDst(idx)];
         recvTmp[recvRank][realRecvSize].second = recvWeightDst(idx);
+        tmpMask[globalLocalIndexGridDestSendToServer[recvIndexDst(idx)]] = true;
          ++realRecvSize;
       }