Changeset 689 for XIOS/trunk/src/transformation/grid_transformation.cpp

Timestamp:

09/15/15 17:31:13 (9 years ago)

Author:

mhnguyen

Message:

Modifying the interface of interpolation domain

+) Change node name from interpolate_from_file_domain to interpolate_domain and add some new atrributes
+) Add more tests into test_remap

Test
+) On Curie
+) test_remap works for direct weight calculation and reading weight calculation from file

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -12 +12 @@
 #include "axis_algorithm_interpolate.hpp"
 #include "domain_algorithm_zoom.hpp"
-#include "domain_algorithm_interpolate_from_file.hpp"
+#include "domain_algorithm_interpolate.hpp"
 #include "context.hpp"
 #include "context_client.hpp"
@@ -276 +276 @@
 
   CZoomDomain* zoomDomain = 0;
-  CInterpolateFromFileDomain* interpFileDomain = 0;
+  CInterpolateDomain* interpFileDomain = 0;
   CGenericAlgorithmTransformation* algo = 0;
   switch (transType)
   {
-    case TRANS_INTERPOLATE_DOMAIN_FROM_FILE:
-      interpFileDomain = dynamic_cast<CInterpolateFromFileDomain*> (it->second);
-      algo = new CDomainAlgorithmInterpolateFromFile(domainListDestP[domainIndex], domainListSrcP[domainIndex],interpFileDomain);
+    case TRANS_INTERPOLATE_DOMAIN:
+      interpFileDomain = dynamic_cast<CInterpolateDomain*> (it->second);
+      algo = new CDomainAlgorithmInterpolate(domainListDestP[domainIndex], domainListSrcP[domainIndex],interpFileDomain);
       break;
     case TRANS_ZOOM_DOMAIN:
@@ -312 +312 @@
   switch (transType)
   {
-    case TRANS_INTERPOLATE_DOMAIN_FROM_FILE:
+    case TRANS_INTERPOLATE_DOMAIN:
     case TRANS_ZOOM_DOMAIN:
       domainIndex = elementPosition2DomainPositionInGrid_[elementPositionInGrid];
@@ -494 +494 @@
      if (searchCurrentSrc.search(itbIndex, iteIndex, globalIndexOfCurrentGridSourceToSend[idx], itIndex))
      {
-//       int index = std::distance(itbArr, itArr);
-       sendBuff[idx+currentBuffPosition] = globalIndexOfOriginalGridSource_[*itIndex]; //[index];
+       sendBuff[idx+currentBuffPosition] = globalIndexOfOriginalGridSource_[*itIndex];
      }
    }