Changeset 2034 for XIOS/dev/dev_oa/src/node/domain.cpp

Timestamp:

02/15/21 21:14:02 (3 years ago)

Author:

oabramkina

Message:

Adding a possibility of tiled and non-tiled sent on the same domain.

File:

• XIOS/dev/dev_oa/src/node/domain.cpp (modified) (5 diffs)

XIOS/dev/dev_oa/src/node/domain.cpp

@@ -35 +35 @@
       , clients(), hasLatInReadFile_(false), hasBoundsLatInReadFile_(false)
       , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false)
-      , isTiled_(false)
+      , isTiled_(false), isTiledOnly_(false)
    {
    }
@@ -49 +49 @@
       , clients(), hasLatInReadFile_(false), hasBoundsLatInReadFile_(false)
       , hasLonInReadFile_(false), hasBoundsLonInReadFile_(false)
-      , isTiled_(false)
+      , isTiled_(false), isTiledOnly_(false)
    {
     }
@@ -255 +255 @@
    {
       return isTiled_;
+   }
+   CATCH
+
+   bool CDomain::isTiledOnly(void) const
+   TRY
+   {
+      return isTiledOnly_;
    }
    CATCH
@@ -1285 +1292 @@
         }
       }
+   }
+   CATCH_DUMP_ATTR
+
+   //----------------------------------------------------------------
+
+   /*!
+    * For tiled domains, data_i/j_index should not take into
+    * account parameters defining data (data_ni/nj, data_i/jbegin...)
+    * \param [out] dataIndexI
+    * \param [out] dataIndexJ
+    * \param [out] infoIndexI
+    * \param [out] infoIndexJ
+    */
+
+   void CDomain::computeCompressionTiled(CArray<int,1>& dataIndexI, CArray<int,1>& dataIndexJ,
+                                         CArray<int,1>& infoIndexI, CArray<int,1>& infoIndexJ)
+   TRY
+   {
+     const int dsize = ni * nj;
+     dataIndexI.resize(dsize);
+     dataIndexJ.resize(dsize);
+
+     dataIndexJ = 0;
+     for (int k = 0; k < ni; ++k)
+       dataIndexI(k) = k;
+
+     infoIndexI.resize(ni*nj);
+     for (int j = 0; j < nj; ++j)
+       for (int i = 0; i < ni; ++i) infoIndexI(i+j*ni) = i+ibegin;
+
+     infoIndexJ.resize(ni*nj);
+     for (int j = 0; j < nj; ++j)
+       for (int i = 0; i < ni; ++i) infoIndexJ(i+j*ni) = j+jbegin;
    }
    CATCH_DUMP_ATTR
@@ -1752 +1792 @@
    TRY
    {
-     if (!ntiles.isEmpty() && ntiles.getValue() >1)  isTiled_ = true;
+     if (!ntiles.isEmpty() && ntiles.getValue() >=1) isTiled_ = true;
+     if (!tile_only.isEmpty() && tile_only.getValue() == true) {
+       isTiled_ = true;
+       isTiledOnly_ = true;
+     }
+
      if (isTiled_)
      {