Changeset 1653 for XIOS/dev/dev_olga/src/node/grid.hpp

Timestamp:

03/06/19 12:11:10 (5 years ago)

Author:

oabramkina

Message:

Developments for visualization of XIOS workflow.

Branch is spawned from trunk r1649.

Boost library is used for producing Graphviz DOT files. Current results: a DOT file representing a static workflow. For a complete proof of concept, DOT files for each timestamp should be generated. The necessary information has been collected by XIOS, it only requires rearranging the information for graphing (changes in classes CWorkflowGraph and CGraphviz).

File:

• XIOS/dev/dev_olga/src/node/grid.hpp (modified) (12 diffs)

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) ;
       public:
          CArray<int, 1> storeIndex_client;
@@ -377 +374 @@
    template <int n>
    void CGrid::inputField(const CArray<double,n>& field, CArray<double,1>& stored) const
+   TRY
    {
 //#ifdef __XIOS_DEBUG
@@ -388 +386 @@
       this->storeField_arr(field.dataFirst(), stored);
    }
+   CATCH
 
    template <int n>
@@ -405 +404 @@
    template <int n>
    void CGrid::outputField(const CArray<double,1>& stored, CArray<double,n>& field) const
+   TRY
    {
 //#ifdef __XIOS_DEBUG
@@ -416 +416 @@
       this->restoreField_arr(stored, field.dataFirst());
    }
+   CATCH
 
    /*!
@@ -425 +426 @@
    template <int N>
    void CGrid::uncompressField(const CArray<double,N>& data, CArray<double,1>& outData) const
+   TRY
    {      
      uncompressField_arr(data.dataFirst(), outData);
    }
+   CATCH
 
    template<int N>
@@ -435 +438 @@
                              const CArray<int,1>& axisDomainOrder,
                              bool createMask)
+   TRY
    {
      int idx = 0;
@@ -530 +534 @@
     }
    }
+   CATCH_DUMP_ATTR
 
    template<int N>
@@ -535 +540 @@
                                   const std::vector<int>& eachDimSize,
                                   bool newValue)
+   TRY
    {
       if (N != eachDimSize.size())
@@ -549 +555 @@
       gridMask = newValue;
    }
+   CATCH_DUMP_ATTR
                                  
 
@@ -558 +565 @@
    template<int N>
    void CGrid::modifyGridMask(CArray<bool,N>& gridMask, const CArray<int,1>& indexToModify, bool valueToModify)
+   TRY
    {     
      int num = indexToModify.numElements();
@@ -565 +573 @@
      }
    }
+   CATCH_DUMP_ATTR
+
    ///--------------------------------------------------------------
 
 
-/*!
-  A grid can have multiple dimension, so can its mask in the form of multi-dimension array.
-It's not a good idea to store all multi-dimension arrays corresponding to each mask.
-One of the ways is to convert this array into 1-dimension one and every process is taken place on it.
-  \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;
-//  }
-//}
 
    // Declare/Define CGridGroup and CGridDefinition