Changeset 623 for XIOS/trunk/src/node/grid.cpp

Timestamp:

06/22/15 13:36:31 (9 years ago)

Author:

mhnguyen

Message:

Implementing transformation algorithm: zoom axis (local commit)

+) Implement zoom axis: zoomed points are points not masked
+) Correct some minor bugs

Test
+) Ok with normal cases: zoom in the last of transformation list
+) There is still a bug in case of zoom then inverse

File:

• XIOS/trunk/src/node/grid.cpp (modified) (3 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -298 +298 @@
       }
    }
+
+   void CGrid::modifyMask(const CArray<int,1>& indexToModify)
+   {
+      using namespace std;
+      std::vector<CDomain*> domainP = this->getDomains();
+      std::vector<CAxis*> axisP = this->getAxis();
+      int dim = domainP.size() * 2 + axisP.size();
+
+      switch (dim) {
+        case 1:
+          modifyGridMask(mask1, indexToModify);
+          break;
+        case 2:
+          modifyGridMask(mask2, indexToModify);
+          break;
+        case 3:
+          modifyGridMask(mask3, indexToModify);
+          break;
+
+        default:
+          break;
+      }
+   }
+
    //---------------------------------------------------------------
 
@@ -850 +874 @@
             nZoomBegin[indexMap[i]] = axisList[axisId]->zoom_begin_srv;
             nZoomSize[indexMap[i]]  = axisList[axisId]->zoom_size_srv;
-            nZoomBeginGlobal[indexMap[i]] = axisList[axisId]->zoom_begin;
+            nZoomBeginGlobal[indexMap[i]] = axisList[axisId]->global_zoom_begin;
             nGlob[indexMap[i]] = axisList[axisId]->size;
             ++axisId;
@@ -1158 +1182 @@
     transformations_ = new CGridTransformation(transformedGrid, this);
     transformations_->computeAll();
+
+    // Ok, now need to compute index of grid source
+    checkMaskIndex(false);
   }