Changeset 1584 for XIOS/dev/dev_olga/src/node

Timestamp:

10/12/18 16:02:37 (6 years ago)

Author:

oabramkina

Message:

Clean-up in transformation classes related to the new treatment of grid mask at the entrance of a workflow.

Location:

XIOS/dev/dev_olga/src/node

Files:

• grid.cpp (modified) (1 diff)
• grid.hpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/node/grid.cpp

@@ -432 +432 @@
 */
 
-  void CGrid::getLocalMask(CArray<bool,1>& localMask)
-  {
-      std::vector<CDomain*> domainP = this->getDomains();
-      std::vector<CAxis*> axisP = this->getAxis();
-      int dim = domainP.size() * 2 + axisP.size();
-
-      switch (dim)
-      {
-        case 0:
-          getLocalMask(mask_0d, localMask);
-          break;
-        case 1:
-          getLocalMask(mask_1d, localMask);
-          break;
-        case 2:
-          getLocalMask(mask_2d, localMask);
-          break;
-        case 3:
-          getLocalMask(mask_3d, localMask);
-          break;
-        case 4:
-          getLocalMask(mask_4d, localMask);
-          break;
-        case 5:
-          getLocalMask(mask_5d, localMask);
-          break;
-        case 6:
-          getLocalMask(mask_6d, localMask);
-          break;
-        case 7:
-          getLocalMask(mask_7d, localMask);
-          break;
-        default:
-          break;
-      }
-  }
+//  void CGrid::getLocalMask(CArray<bool,1>& localMask)
+//  {
+//      std::vector<CDomain*> domainP = this->getDomains();
+//      std::vector<CAxis*> axisP = this->getAxis();
+//      int dim = domainP.size() * 2 + axisP.size();
+//
+//      switch (dim)
+//      {
+//        case 0:
+//          getLocalMask(mask_0d, localMask);
+//          break;
+//        case 1:
+//          getLocalMask(mask_1d, localMask);
+//          break;
+//        case 2:
+//          getLocalMask(mask_2d, localMask);
+//          break;
+//        case 3:
+//          getLocalMask(mask_3d, localMask);
+//          break;
+//        case 4:
+//          getLocalMask(mask_4d, localMask);
+//          break;
+//        case 5:
+//          getLocalMask(mask_5d, localMask);
+//          break;
+//        case 6:
+//          getLocalMask(mask_6d, localMask);
+//          break;
+//        case 7:
+//          getLocalMask(mask_7d, localMask);
+//          break;
+//        default:
+//          break;
+//      }
+//  }
       
    /*

XIOS/dev/dev_olga/src/node/grid.hpp

@@ -205 +205 @@
          bool hasTransform();
          size_t getGlobalWrittenSize(void) ;
-         void getLocalMask(CArray<bool,1>& localMask) ;
-         template<int N>
-         void getLocalMask(const CArray<bool,N>& gridMask, CArray<bool,1>& localMask) ;
+//         void getLocalMask(CArray<bool,1>& localMask) ;
+//         template<int N>
+//         void getLocalMask(const CArray<bool,N>& gridMask, CArray<bool,1>& localMask) ;
       public:
          CArray<int, 1> storeIndex_client;
@@ -573 +573 @@
   \param [in] multi-dimension array grid mask
 */
-template<int N>
-void CGrid::getLocalMask(const CArray<bool,N>& gridMask, CArray<bool,1>& localMask)
-{
-  if (gridMask.isEmpty()) return ;
-  int dim = gridMask.dimensions();
-  std::vector<int> dimensionSizes(dim);
-  for (int i = 0; i < dim; ++i) dimensionSizes[i] = gridMask.extent(i);
-
-  std::vector<int> idxLoop(dim,0);
-  int ssize = gridMask.numElements(), idx = 0;
-  localMask.resize(ssize);
-  while (idx < ssize)
-  {
-    for (int i = 0; i < dim-1; ++i)
-    {
-      if (idxLoop[i] == dimensionSizes[i])
-      {
-        idxLoop[i] = 0;
-        ++idxLoop[i+1];
-      }
-    }
-
-    int maskIndex = idxLoop[0];
-    int mulDim = 1;
-    for (int k = 1; k < dim; ++k)
-    {
-      mulDim *= dimensionSizes[k-1];
-      maskIndex += idxLoop[k]*mulDim;
-    }
-    localMask(maskIndex) = *(gridMask.dataFirst()+maskIndex);
-
-    ++idxLoop[0];
-    ++idx;
-  }
-}
+//template<int N>
+//void CGrid::getLocalMask(const CArray<bool,N>& gridMask, CArray<bool,1>& localMask)
+//{
+//  if (gridMask.isEmpty()) return ;
+//  int dim = gridMask.dimensions();
+//  std::vector<int> dimensionSizes(dim);
+//  for (int i = 0; i < dim; ++i) dimensionSizes[i] = gridMask.extent(i);
+//
+//  std::vector<int> idxLoop(dim,0);
+//  int ssize = gridMask.numElements(), idx = 0;
+//  localMask.resize(ssize);
+//  while (idx < ssize)
+//  {
+//    for (int i = 0; i < dim-1; ++i)
+//    {
+//      if (idxLoop[i] == dimensionSizes[i])
+//      {
+//        idxLoop[i] = 0;
+//        ++idxLoop[i+1];
+//      }
+//    }
+//
+//    int maskIndex = idxLoop[0];
+//    int mulDim = 1;
+//    for (int k = 1; k < dim; ++k)
+//    {
+//      mulDim *= dimensionSizes[k-1];
+//      maskIndex += idxLoop[k]*mulDim;
+//    }
+//    localMask(maskIndex) = *(gridMask.dataFirst()+maskIndex);
+//
+//    ++idxLoop[0];
+//    ++idx;
+//  }
+//}
 
    // Declare/Define CGridGroup and CGridDefinition