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

Timestamp:

06/27/12 18:25:24 (12 years ago)

Author:

ymipsl

Message:

Add zoom functionnality on vertical axis

YM

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -101 +101 @@
    //---------------------------------------------------------------
 
+/*
    std::vector<StdSize> CGrid::getLocalShape(void) const
    {
@@ -107 +108 @@
       retvalue.push_back(domain->zoom_nj_loc.getValue());
       if (this->withAxis)
-         retvalue.push_back(this->axis->size.getValue());
+         retvalue.push_back(this->axis->zoom_size.getValue());
       return (retvalue);
    }
+*/
    //---------------------------------------------------------------
    
+/*
    StdSize CGrid::getLocalSize(void) const
    {
@@ -120 +123 @@
       return (retvalue);
    }
-   
-   //---------------------------------------------------------------
-
+*/
+   //---------------------------------------------------------------
+/*
    std::vector<StdSize> CGrid::getGlobalShape(void) const
    {
@@ -132 +135 @@
       return (retvalue);
    }
-   //---------------------------------------------------------------
-   
+*/
+   //---------------------------------------------------------------
+
+/*   
    StdSize CGrid::getGlobalSize(void) const
    {
@@ -142 +147 @@
       return (retvalue);
    }
-
+*/
    StdSize CGrid::getDataSize(void) const
    {
@@ -224 +229 @@
       const int ni   = domain->ni.getValue() ,
                 nj   = domain->nj.getValue() ,
-                size = (this->hasAxis()) ? axis->size.getValue() : 1 ;
+                size = (this->hasAxis()) ? axis->size.getValue() : 1 ,
+                lbegin = (this->hasAxis()) ? axis->zoom_begin.getValue()-1 : 0 ,
+                lend = (this->hasAxis()) ? axis->zoom_end.getValue()-1 : 0 ;
 
 
@@ -254 +261 @@
                                 : (temp_j - 1) ;
 
-            if ((i >= 0 && i < ni) &&
+            if ((l >=lbegin && l<= lend) &&
+                (i >= 0 && i < ni) &&
                 (j >= 0 && j < nj) && (*mask)[i][j])
                indexCount++ ;
@@ -283 +291 @@
                                 : (temp_j - 1) ;
 
-            if ((i >= 0 && i < ni) &&
+            if ((l >= lbegin && l <= lend) &&
+                (i >= 0 && i < ni) &&
                 (j >= 0 && j < nj) && (*mask)[i][j])
             {
@@ -294 +303 @@
                (*out_i_client)[indexCount]=i+domain->ibegin_client-1 ;
                (*out_j_client)[indexCount]=j+domain->jbegin_client-1 ;
-               (*out_l_client)[indexCount]=l ;
+               (*out_l_client)[indexCount]=l-lbegin ;
                indexCount++ ;
             }