Changeset 663 for XIOS/trunk

Timestamp:

08/24/15 14:53:13 (9 years ago)

Author:

mhnguyen

Message:

Correcting minor bugs on processing domain transformation

+) Correct domain index calculation in domain transformation
+) Offset index of weight file to make test_remap work correctly

Test
+) On Curie
+) Test_remap pass and result is correct

Location:

XIOS/trunk/src

Files:

• distribution_client.cpp (modified) (2 diffs)
• node/domain.cpp (modified) (2 diffs)
• transformation/domain_algorithm_interpolate_from_file.cpp (modified) (3 diffs)
• transformation/domain_algorithm_transformation.cpp (modified) (2 diffs)

XIOS/trunk/src/distribution_client.cpp

@@ -463 +463 @@
     idx += innerLoopSize;
   }
-
 
   // Now allocate these arrays
@@ -617 +616 @@
                                         const int& dataDim, const int& ni, int& j)
 {
-//  int tempI = dataIIndex + dataIBegin,
-//      tempJ = (1 == dataDim) ? -1
-//                             : (dataJIndex + dataJBegin);
-//  int i = (dataDim == 1) ? (tempI - 1) % ni
-//                     : (tempI - 1) ;
-//  j = (dataDim == 1) ? (tempI - 1) / ni
-//                     : (tempJ - 1) ;
-
   int tempI = dataIIndex + dataIBegin,
       tempJ = (dataJIndex + dataJBegin);

XIOS/trunk/src/node/domain.cpp

@@ -167 +167 @@
       }
       computeNGlobDomain();
+
+      if (0 == global_zoom_ni) global_zoom_ni = ni_glo;
+      if (0 == global_zoom_nj) global_zoom_nj = nj_glo;
    }
 
@@ -558 +561 @@
       // compute client zoom indices
       // compute client zoom indices
-      if (0 == global_zoom_ni) global_zoom_ni = ni_glo;
-      if (0 == global_zoom_nj) global_zoom_nj = nj_glo;
+//      if (0 == global_zoom_ni) global_zoom_ni = ni_glo;
+//      if (0 == global_zoom_nj) global_zoom_nj = nj_glo;
 
       int global_zoom_iend=global_zoom_ibegin+global_zoom_ni-1 ;

XIOS/trunk/src/transformation/domain_algorithm_interpolate_from_file.cpp

@@ -241 +241 @@
   int clientRank = client->clientRank;
   int clientSize = client->clientSize;
-  
+
   nc_open(filename.c_str(),NC_NOWRITE, &ncid) ;
   nc_inq_dimid(ncid,"n_weight",&weightDimId) ;
@@ -260 +260 @@
     start= mod * (div+1) + (clientRank-mod) * div ;
   }
-  
-  
 
   double* weight=new double[nbWeight] ;
@@ -268 +266 @@
   nc_get_vara_double(ncid, weightId, &start, &nbWeight, weight) ;
 
-  long* srcIndex=new long[nbWeight] ; 
+  long* srcIndex=new long[nbWeight] ;
   int srcIndexId ;
   nc_inq_varid (ncid, "src_idx", &srcIndexId) ;
   nc_get_vara_long(ncid, srcIndexId, &start, &nbWeight, srcIndex) ;
 
-  long* dstIndex=new long[nbWeight] ; 
+  long* dstIndex=new long[nbWeight] ;
   int dstIndexId ;
   nc_inq_varid (ncid, "dst_idx", &dstIndexId) ;
   nc_get_vara_long(ncid, dstIndexId, &start, &nbWeight, dstIndex) ;
-        
+
   for(size_t ind=0; ind<nbWeight;++ind)
-    interpMapValue[dstIndex[ind]].push_back(make_pair(srcIndex[ind],weight[ind]));
-}
-
-}
+    interpMapValue[dstIndex[ind]-1].push_back(make_pair(srcIndex[ind]-1,weight[ind]));
+}
+
+}

XIOS/trunk/src/transformation/domain_algorithm_transformation.cpp

@@ -73 +73 @@
     ++idx;
   }
-  int iIndex = domainDestGlobalIndex % domainDestGlobalDim[1];
+  int iIndex = domainDestGlobalIndex % domainDestGlobalDim[0];
   int jIndex = domainDestGlobalIndex / domainDestGlobalDim[0];
 
@@ -188 +188 @@
                                                        int& iIndex, int& jIndex)
 {
-   iIndex = index % njGlob;
+   iIndex = index % niGlob;
    jIndex = index / niGlob;
 }