Changeset 880

Timestamp:

07/04/16 14:13:36 (8 years ago)

Author:

ymipsl

Message:

Interpolation : solve issue with indexed mesh definition.

YM

File:

• XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp (modified) (5 diffs)

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -234 +234 @@
 
 
+  CArray<bool,1> localMask(nSrcLocal) ;
+  localMask=false ;
+  size_t ndata=domainSrc_->data_i_index.numElements() ;
+  for (int idx=0; idx < ndata; ++idx)
+  {
+    size_t ind = domainSrc_->data_j_index(idx)*domainSrc_->ni+domainSrc_->data_i_index(idx) ;
+    localMask(ind)=domainSrc_->mask_1d(ind) ;
+  }
+     
+     
   // supress masked data for the source
   int nSrcLocalUnmasked = 0 ;
-  for (int idx=0 ; idx < nSrcLocal; idx++) if (domainSrc_-> mask_1d(idx)) ++nSrcLocalUnmasked ;
+  for (int idx=0 ; idx < nSrcLocal; idx++) if (localMask(idx)) ++nSrcLocalUnmasked ;
+
 
   CArray<double,2> boundsLonSrcUnmasked(nVertexSrc,nSrcLocalUnmasked);
@@ -245 +256 @@
   for (int idx=0 ; idx < nSrcLocal; idx++)
   {
-    if (domainSrc_-> mask_1d(idx))
+    if (localMask(idx))
     {
       for(int n=0;n<nVertexSrc;++n)
@@ -257 +268 @@
   }
 
+  localMask.resize(nDstLocal) ;
+  localMask=false ;
+  ndata=domainDest_->data_i_index.numElements() ;
+  for (int idx=0; idx < ndata; ++idx)
+  {
+    size_t ind = domainDest_->data_j_index(idx)*domainDest_->ni+domainDest_->data_i_index(idx) ;
+    localMask(ind)=domainDest_->mask_1d(ind) ;
+  }
+     
   int nDstLocalUnmasked = 0 ;
-  for (int idx=0 ; idx < nDstLocal; idx++) if (domainDest_-> mask_1d(idx)) ++nDstLocalUnmasked ;
+  for (int idx=0 ; idx < nDstLocal; idx++) if (localMask(idx)) ++nDstLocalUnmasked ;
 
   CArray<double,2> boundsLonDestUnmasked(nVertexDest,nDstLocalUnmasked);
@@ -267 +287 @@
   for (int idx=0 ; idx < nDstLocal; idx++)
   {
-    if (domainDest_-> mask_1d(idx))
+    if (localMask(idx))
     {
       for(int n=0;n<nVertexDest;++n)
@@ -279 +299 @@
   }
 
-//  mapper.setSourceMesh(boundsLonSrc.dataFirst(), boundsLatSrc.dataFirst(), nVertexSrc, nSrcLocal, &srcPole[0], globalSrc);
   mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked);
-//  mapper.setTargetMesh(boundsLonDest.dataFirst(), boundsLatDest.dataFirst(), nVertexDest, nDstLocal, &dstPole[0], globalDst);
   mapper.setTargetMesh(boundsLonDestUnmasked.dataFirst(), boundsLatDestUnmasked.dataFirst(), nVertexDest, nDstLocalUnmasked, &dstPole[0], globalDstUnmasked);