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

Timestamp:

06/28/18 17:53:42 (6 years ago)

Author:

oabramkina

Message:

The zoom is dead, long live the zoom.

Replacing domain_zoom transformation by copying it from domain_extract. From now on, only the zoomed part of a domain is sent to servers. On the user's side all definitions stay the same.

To do soon: axis_zoom.

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -1632 +1632 @@
           std::vector<CAxis*> axisList = getAxis();
           std::vector<int> nZoomBegin(ssize), nZoomSize(ssize), nGlob(ssize), nZoomBeginGlobal(ssize), nGlobElement(numElement);
-          std::vector<CArray<int,1> > globalZoomIndex(numElement);
+          std::vector<CArray<int,1> > globalZoomIndex(numElement);  // RENAME INTO globalIndex
           for (int i = 0; i < numElement; ++i)
           {
@@ -1638 +1638 @@
             if (2 == axis_domain_order(i)) //domain
             {
-              nZoomBegin[indexMap[i]] = domainList[domainId]->zoom_ibegin;
-              nZoomSize[indexMap[i]]  = domainList[domainId]->zoom_ni;
-              nZoomBeginGlobal[indexMap[i]] = domainList[domainId]->global_zoom_ibegin;              
+              nZoomBegin[indexMap[i]] = domainList[domainId]->ibegin;
+              nZoomSize[indexMap[i]]  = domainList[domainId]->ni;
+              nZoomBeginGlobal[indexMap[i]] = 0;
               nGlob[indexMap[i]] = domainList[domainId]->ni_glo;
 
-              nZoomBegin[indexMap[i] + 1] = domainList[domainId]->zoom_jbegin;
-              nZoomSize[indexMap[i] + 1] = domainList[domainId]->zoom_nj;
-              nZoomBeginGlobal[indexMap[i] + 1] = domainList[domainId]->global_zoom_jbegin;              
+              nZoomBegin[indexMap[i] + 1] = domainList[domainId]->jbegin;
+              nZoomSize[indexMap[i] + 1] = domainList[domainId]->nj;
+              nZoomBeginGlobal[indexMap[i] + 1] = 0;
               nGlob[indexMap[i] + 1] = domainList[domainId]->nj_glo;