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

Timestamp:

01/20/13 23:14:35 (11 years ago)

Author:

ymipsl

Message:

Add grid mask attribute

YM

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -176 +176 @@
       this->solveDomainRef() ;
       this->solveAxisRef() ;
+        
       if (context->hasClient)
       {
-         
+         checkMask() ;
          this->computeIndex() ;
 
@@ -190 +191 @@
    }
 
+
+   void CGrid::checkMask(void)
+   {
+      using namespace std;
+
+      unsigned int niu = domain->ni, nju = domain->nj;
+      unsigned int nlu = 1 ;
+      if (hasAxis()) nlu=axis->size ;
+
+      if (!mask.isEmpty())
+      {
+         if ((mask.extent(0) != niu) ||
+             (mask.extent(1) != nju) ||
+             (mask.extent(2) != nlu))
+             ERROR("CGrid::checkAttributes(void)",
+                  <<"Le masque n'a pas la même taille que la grille locale") ;
+      }
+      else 
+      {
+        mask.resize(niu,nju,nlu) ;
+        mask=true  ;
+      }
+     
+      CArray<bool,2>& domainMask = domain->mask ;
+      for (int l=0; l < nlu ; l++)
+        for (int j=0; j < nju ; j++)
+          for(int i=0; i<niu ; i++) mask(i,j,l) = mask(i,j,l) && domainMask(i,j) ;
+        
+      
+   }
+   
    //---------------------------------------------------------------
 
@@ -246 +278 @@
       CArray<int,1> data_i_index = domain->data_i_index ;
       CArray<int,1> data_j_index = domain->data_j_index ;
-      
-
-      CArray<bool,2>& mask = domain->mask ;
-      CArray<int,2>& local_mask = domain->local_mask ;
       
 
@@ -268 +296 @@
             if ((l >=lbegin && l<= lend) &&
                 (i >= 0 && i < ni) &&
-                (j >= 0 && j < nj) && mask(i,j))
+                (j >= 0 && j < nj) && mask(i,j,l))
                indexCount++ ;
          }
@@ -298 +326 @@
             if ((l >= lbegin && l <= lend) &&
                 (i >= 0 && i < ni) &&
-                (j >= 0 && j < nj) && mask(i,j))
+                (j >= 0 && j < nj) && mask(i,j,l))
             {
                (*storeIndex[0])(indexCount) = count ;