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

Timestamp:

02/10/16 14:35:03 (8 years ago)

Author:

mhnguyen

Message:

Making some improvements of transformation algorithm

+) Correct the way to enlisting transformations in an element (domain, axis)
+) Optimize generic transformation to make sure temporary grid to be created on demand
+) Update some mpi tag to prevent conflict
+) Correct some minor stuffs
+) Update documents

Test
+) On Curie
+) all test pass

File:

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

XIOS/trunk/src/node/grid.hpp

@@ -206 +206 @@
          map<int, CArray<size_t, 1> > outIndexFromClient, compressedOutIndexFromClient;
          void checkMask(void);
+         void createMask(void);
          void modifyMask(const CArray<int,1>& indexToModify);
 
@@ -217 +218 @@
                           const std::vector<CArray<bool,1>* >& domainMasks,
                           const std::vector<CArray<bool,1>* >& axisMasks,
-                          const CArray<bool,1>& axisDomainOrder);
+                          const CArray<bool,1>& axisDomainOrder,
+                          bool createMask = false);
         template<int N>
         void modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify);
@@ -295 +297 @@
                              const std::vector<CArray<bool,1>* >& domainMasks,
                              const std::vector<CArray<bool,1>* >& axisMasks,
-                             const CArray<bool,1>& axisDomainOrder)
+                             const CArray<bool,1>& axisDomainOrder,
+                             bool createMask)
    {
      int idx = 0;
@@ -319 +322 @@
     }
 
-    if (!gridMask.isEmpty())
+    if (!gridMask.isEmpty() && !createMask)
     {
       for (int i = 0; i < dim; ++i)