Changeset 871

Timestamp:

06/09/16 11:33:37 (8 years ago)

Author:

mhnguyen

Message:

Correcting a bug which sometimes make transformations between different size grids incorrect

+) Correct inputs of some functions
+) Add some auxilliary functions.
+) Add new test cases for test_remap

Test
+) Basic test pass
+) Single horizontal and vertical interpolation are correct
+) Chained interpolation are not correct

Location:

XIOS/trunk

Files:

• inputs/REMAP/iodef.xml (modified) (3 diffs)
• src/test/test_remap.f90 (modified) (8 diffs)
• src/transformation/generic_algorithm_transformation.cpp (modified) (1 diff)
• src/transformation/grid_transformation.cpp (modified) (10 diffs)
• src/transformation/grid_transformation.hpp (modified) (4 diffs)

XIOS/trunk/inputs/REMAP/iodef.xml

@@ -4 +4 @@
  <context id="test">
    <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_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"/>
+     <field id="src_field_3D_pression" operation="instant" grid_ref="src_grid_3D"/>
      <field id="src_field_clone" operation="instant" field_ref="src_field" domain_ref="src_domain_clone"/>
      <field id="dst_field" operation="instant" field_ref="src_field" domain_ref="dst_domain"/>
-     <field id="tmp_field" operation="instant" domain_ref="src_domain_regular_tmp"/>
-     <field id="tmp_field_clone" field_ref="tmp_field"/>
-     <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />
-     <field id="tmp_field_2" operation="instant" grid_ref="src_grid_unstructured" />
-     <field id="dst_field_regular" operation="instant" field_ref="tmp_field_2" grid_ref="dst_grid_regular" read_access="true"/>
      <field id="dst_field_regular_pole" operation="instant" field_ref="src_field" domain_ref="dst_domain_regular_pole"/>
-     <field id="dst_field_regular_pole_1" operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular_pole"/>
-     <field id="dst_field_regular_pole_2" operation="instant" field_ref="tmp_field_clone" domain_ref="dst_domain_regular_pole"/>
+<!--     <field id="tmp_field" operation="instant" domain_ref="src_domain_regular_tmp"/>-->
+<!--     <field id="tmp_field_clone" field_ref="tmp_field"/>-->
+<!--     <field id="tmp_field_1" operation="instant" grid_ref="src_grid_curvilinear" />-->
+<!--     <field id="tmp_field_2" operation="instant" grid_ref="src_grid_unstructured" />-->
+<!--     <field id="dst_field_regular" operation="instant" field_ref="tmp_field_2" grid_ref="dst_grid_regular" read_access="true"/>-->
+<!--     <field id="dst_field_3D" operation="instant" field_ref="src_field_3D" grid_ref="dst_grid_3D"/>-->
+<!--     <field id="dst_field_regular_pole_1" operation="instant" field_ref="tmp_field" domain_ref="dst_domain_regular_pole"/>-->
+<!--     <field id="dst_field_regular_pole_2" operation="instant" field_ref="tmp_field_clone" domain_ref="dst_domain_regular_pole"/>-->
    </field_definition>
 
    <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>
+    <file id="output_3D_pression" name="output_3D_pression">
+        <field field_ref="src_field_3D_pression" name="field" />
      </file>
      <file id="output_clone" name="output_clone">
-        <field field_ref="src_field_clone" name="field" />
+<!--        <field field_ref="src_field_clone" name="field" />-->
      </file>
      <file id="output_dst" name="output_dst" type="one_file">
-        <field field_ref="dst_field" name="field" />
+<!--        <field field_ref="dst_field" name="field" />-->
      </file>
      <file id="out_dst_regular_pole" name="out_dst_regular_pole" type="one_file">
-        <field field_ref="dst_field_regular_pole" name="field" />
+<!--        <field field_ref="dst_field_regular_pole" name="field" />-->
      </file>
-     <file id="out_dst_regular_pole_1" name="out_dst_regular_pole_1" type="one_file">
-        <field field_ref="dst_field_regular_pole_1" name="field" />
+     <file id="regular_field_3D" name="regular_field_3D" type="one_file">
+        <field field_ref="src_field_3D_interp" name="field" domain_ref="dst_domain_regular_pole" />
      </file>
-     <file id="out_dst_regular_pole_2" name="out_dst_regular_pole_2" type="one_file">
-        <field field_ref="dst_field_regular_pole_2" name="field" />
+    <file id="regular_field_3D_interp" name="regular_field_3D_interp" type="one_file">
+        <field field_ref="src_field_3D_interp" name="field" />
      </file>
-     <file id="output_dst_regular" name="output_dst_regular" type="one_file">
-        <field field_ref="dst_field_regular" name="field" />
-     </file>
-     <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file">
-        <field field_ref="tmp_field_1" operation="instant"/>
-     </file>
-     <file id="output_dst_unstructured" name="output_dst_unstructured" type="one_file">
-        <field field_ref="tmp_field_2" operation="instant"/>
-     </file>
-     <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file">
-        <field id="src_field_regular_tmp" name="field" domain_ref="src_domain_regular_tmp" operation="instant"/>
-     </file>
-     <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file">
-        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>
-     </file>
-     <file id="output_unstructured" name="output_unstructured" mode="read" type="one_file">
-        <field id="field_src_unstructred" name="field" grid_ref="src_grid_unstructured" operation="instant"/>
-     </file>
+<!--     <file id="out_dst_regular_pole_1" name="out_dst_regular_pole_1" type="one_file">-->
+<!--        <field field_ref="dst_field_regular_pole_1" name="field" />-->
+<!--     </file>-->
+<!--     <file id="out_dst_regular_pole_2" name="out_dst_regular_pole_2" type="one_file">-->
+<!--        <field field_ref="dst_field_regular_pole_2" name="field" />-->
+<!--     </file>-->
+<!--     <file id="output_dst_regular" name="output_dst_regular" type="one_file">-->
+<!--        <field field_ref="dst_field_regular" name="field" />-->
+<!--     </file>-->
+<!--     <file id="output_dst_curvilinear" name="output_dst_curvilinear" type="one_file">-->
+<!--        <field field_ref="tmp_field_1" operation="instant"/>-->
+<!--     </file>-->
+<!--     <file id="output_dst_unstructured" name="output_dst_unstructured" type="one_file">-->
+<!--        <field field_ref="tmp_field_2" operation="instant"/>-->
+<!--     </file>-->
+<!--     <file id="output_src_regular_tmp" name="output_src_regular_tmp" mode="read" type="one_file">-->
+<!--        <field id="src_field_regular_tmp" name="field" domain_ref="src_domain_regular_tmp" operation="instant"/>-->
+<!--     </file>-->
+<!--     <file id="output_src_curvilinear" name="output_src_curvilinear" mode="read" type="one_file">-->
+<!--        <field id="src_field_curvilinear" name="field_A" grid_ref="src_grid_curvilinear" operation="instant"/>-->
+<!--     </file>-->
+<!--     <file id="output_unstructured" name="output_unstructured" mode="read" type="one_file">-->
+<!--        <field id="field_src_unstructred" name="field" grid_ref="src_grid_unstructured" operation="instant"/>-->
+<!--     </file>-->
    </file_definition>
 
 
    <axis_definition>
+     <axis id="dst_axis" positive="down" n_glo="2" value="(0,1)[120 220]">
+        <interpolate_axis type="polynomial" order="1" coordinate="src_field_3D_pression"/>
+<!--        <interpolate_axis type="polynomial" order="1" />-->
+     </axis>
+     <axis id="src_axis" positive="down" />
      <axis id="src_axis_curvilinear" />
-   </axis_definition>
-   <axis_definition>
-     <axis id="axis_surface_curvi" />
    </axis_definition>
 
@@ -73 +89 @@
        <interpolate_domain/>
      </domain>
-     <domain id="dst_domain_regular_pole" ni_glo="180" nj_glo="90" type="rectilinear">
+     <domain id="dst_domain_regular_pole" ni_glo="90" nj_glo="45" type="rectilinear">
        <generate_rectilinear_domain id="domain_regular_pole"/>
        <interpolate_domain/>
-       <zoom_domain id="zoom_0" ibegin="0" ni="90" jbegin="0" nj="90"/>
      </domain>
      <domain id="dst_domain_regular" ni_glo="90" nj_glo="45" type="rectilinear">
@@ -104 +119 @@
       <domain domain_ref="dst_domain_regular"/>
     </grid>
+    <grid id="src_grid_3D">
+      <domain domain_ref="src_domain"/>
+      <axis axis_ref="src_axis"/>
+    </grid>
+    <grid id="dst_grid_3D">
+<!--      <domain domain_ref="src_domain"/>-->
+      <domain domain_ref="dst_domain_regular_pole"/>
+<!--      <axis axis_ref="src_axis"/>-->
+      <axis axis_ref="dst_axis"/>
+    </grid>
   </grid_definition>
   </context>

XIOS/trunk/src/test/test_remap.f90

@@ -20 +20 @@
   DOUBLE PRECISION,ALLOCATABLE :: src_boundslon(:,:), dst_boundslon(:,:)
   DOUBLE PRECISION,ALLOCATABLE :: src_boundslat(:,:), dst_boundslat(:,:)
-  DOUBLE PRECISION,ALLOCATABLE :: src_field(:), tmp_field(:), tmp_field_1(:), tmp_field_2(:)
+  DOUBLE PRECISION,ALLOCATABLE :: src_field(:), tmp_field(:), tmp_field_1(:), tmp_field_2(:), src_field_3D(:,:), lval(:), lval1(:), src_field_pression(:,:)
   INTEGER :: src_ni_glo, dst_ni_glo;
   INTEGER :: src_nvertex, dst_nvertex;
@@ -34 +34 @@
   INTEGER :: ts
   INTEGER :: i
+  INTEGER,PARAMETER :: llm=5, interpolatedLlm = 4
 
   CALL MPI_INIT(ierr)
@@ -65 +66 @@
   ALLOCATE(src_boundslat(src_nvertex,src_ni))
   ALLOCATE(src_field(src_ni))
+  ALLOCATE(src_field_3D(src_ni,llm))
+  ALLOCATE(src_field_pression(src_ni,llm))
+  ALLOCATE(lval(llm))
+  ALLOCATE(lval1(interpolatedLlm))
 
   ierr=NF90_INQ_VARID(ncid,"lon",varid)
@@ -76 +81 @@
   ierr=NF90_INQ_VARID(ncid,"val",varid)
   ierr=NF90_GET_VAR(ncid,varid, src_field, start=(/src_ibegin+1/),count=(/src_ni/))
+  DO i=1,src_ni
+    src_field_3D(i,:) = src_field(i)
+  ENDDO
 
+  DO i=1,llm
+    lval(i) = i*100
+    src_field_pression(:,i) = i * 100
+    src_field_3D(:,i) = src_field_3D(:,i) + i * 10
+  ENDDO
+
+  DO i=1,interpolatedLlm
+    lval1(i) = i*10 + 2
+  ENDDO
 
   ierr=NF90_OPEN(dst_file, NF90_NOWRITE, ncid)
@@ -108 +125 @@
   ierr=NF90_GET_VAR(ncid,varid, dst_boundslat, start=(/1,dst_ibegin+1/),count=(/dst_nvertex,dst_ni/))
 
+
   CALL xios_context_initialize("test",comm)
   CALL xios_get_handle("test",ctx_hdl)
@@ -120 +138 @@
                             bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex)
 
+  CALL xios_set_axis_attr("src_axis", n_glo=llm, value=lval)
+
   CALL xios_set_domain_attr("dst_domain", ni_glo=dst_ni_glo, ibegin=dst_ibegin, ni=dst_ni, type="unstructured")
   CALL xios_set_domain_attr("dst_domain", lonvalue_1D=dst_lon, latvalue_1D=dst_lat, &
@@ -128 +148 @@
 
   CALL xios_close_context_definition()
-  CALL xios_get_domain_attr("src_domain_regular_tmp", ni=src_tmp_ni, nj=src_tmp_nj)
-  ALLOCATE(tmp_field(src_tmp_ni*src_tmp_nj))
+!  CALL xios_get_domain_attr("src_domain_regular_tmp", ni=src_tmp_ni, nj=src_tmp_nj)
+!  ALLOCATE(tmp_field(src_tmp_ni*src_tmp_nj))
+!
+!  CALL xios_get_axis_attr("src_axis_curvilinear", n=src_tmp_n)
+!  CALL xios_get_domain_attr("src_domain_curvilinear", ni=src_tmp_ni, nj=src_tmp_nj)
+!  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
 
-  CALL xios_get_axis_attr("src_axis_curvilinear", n=src_tmp_n)
-  CALL xios_get_domain_attr("src_domain_curvilinear", ni=src_tmp_ni, nj=src_tmp_nj)
-  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
+!  CALL xios_get_domain_attr("src_domain_unstructured", ni=src_tmp_ni, nj=src_tmp_nj)
+!  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
 
-  CALL xios_get_domain_attr("src_domain_unstructured", ni=src_tmp_ni, nj=src_tmp_nj)
-  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
+  DO ts=1,5
 
-  DO ts=1,1
-
-    CALL xios_recv_field("src_field_regular_tmp", tmp_field)
-    CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
-    CALL xios_recv_field("field_src_unstructred", tmp_field_2)
+!    CALL xios_recv_field("src_field_regular_tmp", tmp_field)
+!    CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
+!    CALL xios_recv_field("field_src_unstructred", tmp_field_2)
     CALL xios_update_calendar(ts)
     CALL xios_send_field("src_field",src_field)
-    CALL xios_send_field("tmp_field",tmp_field)
-    CALL xios_send_field("tmp_field_1",tmp_field_1)
-    CALL xios_send_field("tmp_field_2",tmp_field_2)
+    CALL xios_send_field("src_field_3D",src_field_3D)
+    CALL xios_send_field("src_field_3D_pression",src_field_pression)
+!    CALL xios_send_field("tmp_field",tmp_field)
+!    CALL xios_send_field("tmp_field_1",tmp_field_1)
+!    CALL xios_send_field("tmp_field_2",tmp_field_2)
     CALL wait_us(5000) ;
   ENDDO
@@ -155 +177 @@
   DEALLOCATE(src_lon, src_lat, src_boundslon,src_boundslat, src_field)
   DEALLOCATE(dst_lon, dst_lat, dst_boundslon,dst_boundslat)
-  DEALLOCATE(tmp_field, tmp_field_1, tmp_field_2)
+!  DEALLOCATE(tmp_field, tmp_field_1, tmp_field_2)
 
   CALL MPI_COMM_FREE(comm, ierr)

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -201 +201 @@
                                   srcRank,
                                   src2DstMap,
+                                  gridSrc,
                                   gridDst,
-                                  gridSrc,
                                   globalElementIndexOnProc,
                                   globaIndexWeightFromSrcToDst);

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -23 +23 @@
 namespace xios {
 CGridTransformation::CGridTransformation(CGrid* destination, CGrid* source)
-: gridSource_(source), gridDestination_(destination), originalGridSource_(source),
-  algoTypes_(), nbAlgos_(0), tempGrids_(),
+: gridSource_(source), gridDestination_(destination), tmpGridDestination_(destination),
+  originalGridSource_(source), algoTypes_(), nbAlgos_(0), tempGridSrcs_(), tempGridDests_(),
   auxInputs_(), dynamicalTransformation_(false), timeStamp_()
 
@@ -279 +279 @@
 
 /*!
+  If there are more than one transformation, a new temporary grid will be created and it will play the role of grid destination.
+This new created one keeps a pointer to the real transformed element of grid destination and generate new copies of other elements from grid source.
+  \param [in] elementPositionInGrid position of element in grid
+  \param [in] transType transformation type
+*/
+void CGridTransformation::setUpGridDestination(int elementPositionInGrid, ETranformationType transType, int nbTransformation)
+{
+  if (isSpecialTransformation(transType)) return;
+
+  if (!tempGridDests_.empty() && (getNbAlgo() == tempGridDests_.size()))
+  {
+    tempGridDests_.resize(0);
+//    tmpGridDestination_ = tempGridDests_[nbTransformation];
+//    return;
+  }
+  std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
+  std::vector<CAxis*> axisListSrcP = gridSource_->getAxis(), axisDst;
+
+  std::vector<CDomain*> domListDestP = gridDestination_->getDomains();
+  std::vector<CDomain*> domListSrcP = gridSource_->getDomains(), domainDst;
+
+  int axisIndex = -1, domainIndex = -1;
+  switch (transType)
+  {
+    case TRANS_INTERPOLATE_DOMAIN:
+    case TRANS_ZOOM_DOMAIN:
+      domainIndex = elementPosition2DomainPositionInGrid_[elementPositionInGrid];
+      break;
+
+    case TRANS_INTERPOLATE_AXIS:
+    case TRANS_ZOOM_AXIS:
+    case TRANS_INVERSE_AXIS:
+      axisIndex =  elementPosition2AxisPositionInGrid_[elementPositionInGrid];
+      break;
+    default:
+      break;
+  }
+
+  for (int idx = 0; idx < axisListSrcP.size(); ++idx)
+  {
+    CAxis* axis = (axisIndex != idx) ? axisListSrcP[idx] : axisListDestP[idx];
+    axisDst.push_back(axis);
+  }
+
+  for (int idx = 0; idx < domListSrcP.size(); ++idx)
+  {
+    CDomain* domain = (domainIndex != idx) ? domListSrcP[idx] : domListDestP[idx];
+    domainDst.push_back(domain);
+  }
+
+  tmpGridDestination_ = CGrid::createGrid(domainDst, axisDst, gridDestination_->axis_domain_order);
+  tmpGridDestination_->computeGridGlobalDimension(domainDst, axisDst, gridDestination_->axis_domain_order);
+  tempGridDests_.push_back(tmpGridDestination_);
+}
+
+/*!
   Assign the current grid destination to the grid source in the new transformation.
 The current grid destination plays the role of grid source in next transformation (if any).
@@ -285 +341 @@
   \param [in] transType transformation type
 */
-void CGridTransformation::setUpGrid(int elementPositionInGrid, ETranformationType transType, int nbTransformation)
-{
-  if (!tempGrids_.empty() && (getNbAlgo()-1) == tempGrids_.size())
-  {
-    gridSource_ = tempGrids_[nbTransformation];
-    return;
-  }
-
-  std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
+void CGridTransformation::setUpGridSource(int elementPositionInGrid, ETranformationType transType, int nbTransformation)
+{
+  if (!tempGridSrcs_.empty() && (getNbAlgo()-1) == tempGridSrcs_.size())
+  {
+    tempGridSrcs_.resize(0);
+//    gridSource_ = tempGridSrcs_[nbTransformation];
+//    return;
+  }
+
+  std::vector<CAxis*> axisListDestP = tmpGridDestination_->getAxis();
   std::vector<CAxis*> axisListSrcP = gridSource_->getAxis(), axisSrc;
 
-  std::vector<CDomain*> domListDestP = gridDestination_->getDomains();
+  std::vector<CDomain*> domListDestP = tmpGridDestination_->getDomains();
   std::vector<CDomain*> domListSrcP = gridSource_->getDomains(), domainSrc;
 
@@ -318 +375 @@
   for (int idx = 0; idx < axisListSrcP.size(); ++idx)
   {
-    CAxis* axis = CAxis::createAxis();
-    if (axisIndex != idx) axis->axis_ref.setValue(axisListSrcP[idx]->getId());
-    else axis->axis_ref.setValue(axisListDestP[idx]->getId());
-    axis->solveRefInheritance(true);
-    axis->checkAttributesOnClient();
-    axisSrc.push_back(axis);
+    if (axisIndex != idx)
+    {
+      CAxis* axis = axisListDestP[idx];
+      axisSrc.push_back(axis);
+    }
+    else
+    {
+      CAxis* axis = CAxis::createAxis();
+      axis->axis_ref.setValue(axisListDestP[idx]->getId());
+      axis->solveRefInheritance(true);
+      axis->checkAttributesOnClient();
+      axisSrc.push_back(axis);
+    }
   }
 
   for (int idx = 0; idx < domListSrcP.size(); ++idx)
   {
-    CDomain* domain = CDomain::createDomain();
-    if (domainIndex != idx) domain->domain_ref.setValue(domListSrcP[idx]->getId());
-    else domain->domain_ref.setValue(domListDestP[idx]->getId());
-    domain->solveRefInheritance(true);
-    domain->checkAttributesOnClient();
-    domainSrc.push_back(domain);
-  }
-
-  gridSource_ = CGrid::createGrid(domainSrc, axisSrc, gridDestination_->axis_domain_order);
-  gridSource_->computeGridGlobalDimension(domainSrc, axisSrc, gridDestination_->axis_domain_order);
-
-  tempGrids_.push_back(gridSource_);
+    if (domainIndex != idx)
+    {
+      CDomain* domain = domListDestP[idx];
+      domainSrc.push_back(domain);
+    }
+    else
+    {
+      CDomain* domain = CDomain::createDomain();
+      domain->domain_ref.setValue(domListDestP[idx]->getId());
+      domain->solveRefInheritance(true);
+      domain->checkAttributesOnClient();
+      domainSrc.push_back(domain);
+    }
+  }
+
+//  for (int idx = 0; idx < axisListSrcP.size(); ++idx)
+//  {
+//    CAxis* axis = CAxis::createAxis();
+//    if (axisIndex != idx) axis->axis_ref.setValue(axisListSrcP[idx]->getId());
+//    else axis->axis_ref.setValue(axisListDestP[idx]->getId());
+//    axis->solveRefInheritance(true);
+//    axis->checkAttributesOnClient();
+//    axisSrc.push_back(axis);
+//  }
+//
+//  for (int idx = 0; idx < domListSrcP.size(); ++idx)
+//  {
+//    CDomain* domain = CDomain::createDomain();
+//    if (domainIndex != idx) domain->domain_ref.setValue(domListSrcP[idx]->getId());
+//    else domain->domain_ref.setValue(domListDestP[idx]->getId());
+//    domain->solveRefInheritance(true);
+//    domain->checkAttributesOnClient();
+//    domainSrc.push_back(domain);
+//  }
+
+  gridSource_ = CGrid::createGrid(domainSrc, axisSrc, tmpGridDestination_->axis_domain_order);
+  gridSource_->computeGridGlobalDimension(domainSrc, axisSrc, tmpGridDestination_->axis_domain_order);
+
+  tempGridSrcs_.push_back(gridSource_);
 }
 
@@ -381 +472 @@
     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);
+//    }
+    setUpGridDestination(elementPositionInGrid, transType, nbAgloTransformation);
+
     // First of all, select an algorithm
     if (!dynamicalTransformation_ || (algoTransformation_.size() < listAlgos_.size()))
@@ -398 +497 @@
       algo->computeGlobalSourceIndex(elementPosition,
                                      gridSource_,
-                                     gridDestination_,
+                                     tmpGridDestination_,
                                      globaIndexWeightFromSrcToDst);
 
@@ -407 +506 @@
       {
         // Now grid destination becomes grid source in a new transformation
-        if (nbAgloTransformation != (nbAlgos_-1)) setUpGrid(elementPositionInGrid, transType, nbAgloTransformation);
+        if (nbAgloTransformation != (nbAlgos_-1)) setUpGridSource(elementPositionInGrid, transType, nbAgloTransformation);
       }
       ++nbAgloTransformation;
@@ -426 +525 @@
 
   // Recalculate the distribution of grid destination
-  CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
+  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
-  nbLocalIndexOnGridDest_.push_back(globalLocalIndexGridDestSendToServer.size());
+  size_t nbLocalIndex = globalLocalIndexGridDestSendToServer.size();
+  nbLocalIndexOnGridDest_.push_back(nbLocalIndex);
+  localMaskOnGridDest_.push_back(std::vector<bool>());
+  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
@@ -671 +781 @@
 }
 
+/*!
+ Number of index will be received on the grid destination
+  \return number of index of data
+*/
 const std::list<size_t>& CGridTransformation::getNbLocalIndexToReceiveOnGridDest() const
 {
@@ -676 +790 @@
 }
 
-}
+/*!
+  Local mask of data which will be received on the grid destination
+  \return local mask of data
+*/
+const std::list<std::vector<bool> >& CGridTransformation::getLocalMaskIndexOnGridDest() const
+{
+  return localMaskOnGridDest_;
+}
+
+}

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -49 +49 @@
   const std::list<RecvIndexGridDestinationMap>& getLocalIndexToReceiveOnGridDest() const;
   const std::list<size_t>& getNbLocalIndexToReceiveOnGridDest() const;
+  const std::list<std::vector<bool> >& getLocalMaskIndexOnGridDest() const;
 
   CGrid* getGridSource() { return originalGridSource_; }
@@ -66 +67 @@
   void selectDomainAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder);
   void selectAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder, bool isDomainAlgo);
-  void setUpGrid(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
+  void setUpGridSource(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
+  void setUpGridDestination(int elementPositionInGrid, ETranformationType transType, int nbTransformation);
   void computeTransformationMapping(const SourceDestinationIndexMap& globalIndexWeightFromSrcToDest);
   bool isSpecialTransformation(ETranformationType transType);
@@ -75 +77 @@
 
   //! Grid destination on transformation
-  CGrid* gridDestination_;
+  CGrid* gridDestination_, *tmpGridDestination_;
 
   //! The grid source of the first transformation (original grid source)
@@ -104 +106 @@
   //! Number of local index of data to receive on grid destination
   std::list<size_t> nbLocalIndexOnGridDest_;
+  std::list<std::vector<bool> > localMaskOnGridDest_;
 
   //! Position of axis and domain in grid
   std::map<int, int> elementPosition2AxisPositionInGrid_, elementPosition2DomainPositionInGrid_;
 
-  std::vector<CGrid*> tempGrids_;
+  std::vector<CGrid*> tempGridSrcs_, tempGridDests_;
   std::vector<StdString> auxInputs_;
   bool dynamicalTransformation_;