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

Timestamp:

07/28/15 13:37:07 (9 years ago)

Author:

mhnguyen

Message:

Making changes in domain to make sure unstructed grid work with new method of index distribution

+) Change the way define i_index and j_index of a domain
+) Remove some redundant attributes of domain
+) Adjust the way to calculate index distribution on server side

Test
+) Make some minor change to test_unstruct_complete to work with new XIOS
+) On Curie
+) All test pass and correct

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (3 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 "context.hpp"
 #include "context_client.hpp"
@@ -277 +278 @@
 
   CZoomDomain* zoomDomain = 0;
+  CInterpolateFromFileDomain* 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);
+      break;
     case TRANS_ZOOM_DOMAIN:
       zoomDomain = dynamic_cast<CZoomDomain*> (it->second);
@@ -308 +314 @@
   switch (transType)
   {
+    case TRANS_INTERPOLATE_DOMAIN_FROM_FILE:
     case TRANS_ZOOM_DOMAIN:
       domainIndex = elementPosition2DomainPositionInGrid_[elementPositionInGrid];