Changeset 821 for XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

Timestamp:

02/10/16 14:35:03 (8 years ago)

Author:

mhnguyen

Message:

Making some improvements of transformation algorithm

+) Correct the way to enlisting transformations in an element (domain, axis)
+) Optimize generic transformation to make sure temporary grid to be created on demand
+) Update some mpi tag to prevent conflict
+) Correct some minor stuffs
+) Update documents

Test
+) On Curie
+) all test pass

File:

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

XIOS/trunk/src/transformation/domain_algorithm_interpolate.cpp

@@ -15 +15 @@
 #include "netcdf.hpp"
 #include "mapper.hpp"
+#include "mpi_tag.hpp"
 
 namespace xios {
@@ -95 +96 @@
           double step=(domainSrc_->lon_end-domainSrc_->lon_start)/domainSrc_->ni_glo ;
           for(int i=0; i<domainSrc_->ni_glo; ++i) lon_g(i)=domainSrc_->lon_start+i*step ;
-          step=(domainSrc_->lat_end-domainSrc_->lat_start)/domainSrc_->nj_glo ; 
+          step=(domainSrc_->lat_end-domainSrc_->lat_start)/domainSrc_->nj_glo ;
           for(int i=0; i<domainSrc_->ni_glo; ++i) lat_g(i)=domainSrc_->lat_start+i*step ;
         }
@@ -160 +161 @@
           double step=(domainDest_->lon_end-domainDest_->lon_start)/domainDest_->ni_glo ;
           for(int i=0; i<domainDest_->ni_glo; ++i) lon_g(i)=domainDest_->lon_start+i*step ;
-          step=(domainDest_->lat_end-domainDest_->lat_start)/domainDest_->nj_glo ; 
+          step=(domainDest_->lat_end-domainDest_->lat_start)/domainDest_->nj_glo ;
           for(int i=0; i<domainDest_->ni_glo; ++i) lat_g(i)=domainDest_->lat_start+i*step ;
         }
@@ -167 +168 @@
     if (std::abs(poleValue - std::abs(lat_g(domainDest_->nj_glo-1))) < NumTraits<double>::epsilon()) isSouthPole = true;
 
-    
-    
-    
+
+
+
     if (isNorthPole && (0 == domainDest_->jbegin.getValue()))
     {
@@ -469 +470 @@
              MPI_INT,
              itMap->first,
-             7,
+             MPI_DOMAIN_INTERPOLATION_DEST_INDEX,
              client->intraComm,
              &sendRequest.back());
@@ -477 +478 @@
              MPI_INT,
              itMap->first,
-             8,
+             MPI_DOMAIN_INTERPOLATION_SRC_INDEX,
              client->intraComm,
              &sendRequest.back());
@@ -485 +486 @@
              MPI_DOUBLE,
              itMap->first,
-             9,
+             MPI_DOMAIN_INTERPOLATION_WEIGHT,
              client->intraComm,
              &sendRequest.back());
@@ -504 +505 @@
              MPI_INT,
              MPI_ANY_SOURCE,
-             7,
+             MPI_DOMAIN_INTERPOLATION_DEST_INDEX,
              client->intraComm,
              &recvStatus);
@@ -516 +517 @@
              MPI_INT,
              clientSrcRank,
-             8,
+             MPI_DOMAIN_INTERPOLATION_SRC_INDEX,
              client->intraComm,
              &recvStatus);
@@ -524 +525 @@
              MPI_DOUBLE,
              clientSrcRank,
-             9,
+             MPI_DOMAIN_INTERPOLATION_WEIGHT,
              client->intraComm,
              &recvStatus);