Changeset 664 for XIOS/trunk/src/node/grid.hpp

Timestamp:

08/24/15 14:53:17 (9 years ago)

Author:

mhnguyen

Message:

Changing some domain attributes

+) Longitude and latitude from now on can be 2 dimension array

Test
+) On Curie
+) test_client, test_complete pass and are correct

File:

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

XIOS/trunk/src/node/grid.hpp

@@ -191 +191 @@
        template<int N>
        void checkGridMask(CArray<bool,N>& gridMask,
-                          const std::vector<CArray<bool,2>* >& domainMasks,
+                          const std::vector<CArray<bool,1>* >& domainMasks,
                           const std::vector<CArray<bool,1>* >& axisMasks,
                           const CArray<bool,1>& axisDomainOrder);
@@ -267 +267 @@
    template<int N>
    void CGrid::checkGridMask(CArray<bool,N>& gridMask,
-                             const std::vector<CArray<bool,2>* >& domainMasks,
+                             const std::vector<CArray<bool,1>* >& domainMasks,
                              const std::vector<CArray<bool,1>* >& axisMasks,
                              const CArray<bool,1>& axisDomainOrder)
@@ -274 +274 @@
      int numElement = axisDomainOrder.numElements();
      int dim = domainMasks.size() * 2 + axisMasks.size();
+     std::vector<CDomain*> domainP = this->getDomains();
 
      std::vector<int> idxLoop(dim,0), indexMap(numElement), eachDimSize(dim);
@@ -282 +283 @@
       indexMap[i] = idx;
       if (true == axisDomainOrder(i)) {
-          eachDimSize[indexMap[i]]   = domainMasks[idxDomain]->extent(0);
-          eachDimSize[indexMap[i]+1] = domainMasks[idxDomain]->extent(1);
+          eachDimSize[indexMap[i]]   = domainP[idxDomain]->ni;
+          eachDimSize[indexMap[i]+1] = domainP[idxDomain]->nj;
           idx += 2; ++idxDomain;
       }
@@ -328 +329 @@
         if (axisDomainOrder(i))
         {
-          maskValue = maskValue && (*domainMasks[idxDomain])(idxLoop[indexMap[i]],
-                                                          idxLoop[indexMap[i]+1]);
+          maskValue = maskValue && (*domainMasks[idxDomain])(idxLoop[indexMap[i]] + idxLoop[indexMap[i]+1] * eachDimSize[indexMap[i]]);
           ++idxDomain;
         }