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

Timestamp:

08/31/18 14:15:54 (6 years ago)

Author:

oabramkina

Message:

Further simplifications on sending data/grid indexes.

(1) Domain/axis mask is not sent anymore. It has been incorporated into data index.

(2) Creating a map that holds grid mask only in case if grid mask is defined.

Still to fix: a hole in a domain or axis.

Location:

XIOS/dev/dev_olga/src/node

Files:

• axis.cpp (modified) (10 diffs)
• domain.cpp (modified) (10 diffs)
• grid.cpp (modified) (3 diffs)

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

@@ -300 +300 @@
       if (context->hasClient)
       {
+        this->checkMask();
         this->checkData();
-        this->checkMask();
         this->checkLabel();
       }
@@ -307 +307 @@
 
    /*!
-      Check the validity of data and fill in values if any.
+      Check the validity of data, fill in values if any, and apply mask.
    */
 
@@ -331 +331 @@
         {
           if ((i+data_begin) >= 0 && (i+data_begin<n))
-            data_index(i) = i+data_begin;
+          {
+            if (mask(i+data_begin))
+              data_index(i) = i+data_begin;
+            else
+              data_index(i) = -1;
+          }
           else
             data_index(i) = -1;
@@ -344 +349 @@
                 << "The size of data_index = "<< data_index.numElements() << "is not equal to the data size data_n = " << data_n.getValue() << ").");
         }
-        data_index.resize(data_n);
         for (int i = 0; i < data_n; ++i)
         {
-          if ((i+data_begin) >= 0 && (i+data_begin<n))
-            data_index(i) = data_index(i);
-          else
+          if ((i+data_begin) >= 0 && (i+data_begin<n) && !mask(i+data_begin))
             data_index(i) = -1;
         }
@@ -1070 +1072 @@
           ind = globalLocalIndexMap_[idx];
           dataIndi(n) = dataIndex(ind);
-          maskIndi(n) = mask(ind);
+//          maskIndi(n) = mask(ind);
 
           if (hasValue)
@@ -1094 +1096 @@
         listData.push_back(CMessage());
         listData.back() << this->getId()
-                        << list_indi.back() << list_dataInd.back() << list_mask.back();
+                        << list_indi.back() << list_dataInd.back(); //<< list_mask.back();
 
         listData.back() << hasValue;
@@ -1155 +1157 @@
       buffer >> vec_indi[idx];
       buffer >> vec_dataInd[idx];      
-      buffer >> vec_mask[idx];
+//      buffer >> vec_mask[idx];
 
       buffer >> hasValue;
@@ -1206 +1208 @@
     CArray<int,1> nonCompressedData(nbData);
     nonCompressedData = -1;   
-    mask.resize(nbData);
-    mask = true;
+//    mask.resize(nbData);
+//    mask = true;
+    // Mask is incorporated into data_index and is not sent/received anymore
+    mask.resize(0);
     if (hasValue)
       value.resize(nbData);
@@ -1220 +1224 @@
       CArray<int,1>& indi = vec_indi[idx];
       CArray<int,1>& dataIndi = vec_dataInd[idx];
-      CArray<bool,1>& maskIndi = vec_mask[idx];
+//      CArray<bool,1>& maskIndi = vec_mask[idx];
       int nb = indi.numElements();
       for (int n = 0; n < nb; ++n)
@@ -1228 +1232 @@
         nonCompressedData(locInd) = (-1 == nonCompressedData(locInd)) ? dataIndi(n) : nonCompressedData(locInd);
 
-        if (!mask(locInd)) // Only rewrite mask if it's not true
-          mask(locInd) = maskIndi(n);
+//        if (!mask(locInd)) // Only rewrite mask if it's not true
+//          mask(locInd) = maskIndi(n);
         
         if (hasValue)

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

@@ -1081 +1081 @@
    void CDomain::checkCompression(void)
    {
+     int i,j,ind;
       if (!data_i_index.isEmpty())
       {
@@ -1101 +1102 @@
                    << "'data_j_index' must be defined when 'data_i_index' is set and 'data_dim' is 2.");
           }
+          for (int k=0; k<data_i_index.numElements(); ++k)
+          {
+            i = data_i_index(k)+data_ibegin ;
+            j = data_j_index(k)+data_jbegin ;
+            if (i>=0 && i<ni && j>=0 && j<nj)
+            {
+              ind=j*ni+i ;
+              if (!domainMask(ind))
+              {
+                data_i_index(k) = -1;
+                data_j_index(k) = -1;
+              }
+            }
+            else
+            {
+              data_i_index(k) = -1;
+              data_j_index(k) = -1;
+            }
+          }
         }
         else // (1 == data_dim)
@@ -1107 +1127 @@
           {
             data_j_index.resize(data_ni);
-            for (int j = 0; j < data_ni; ++j) data_j_index(j) = 0;
+            data_j_index(j) = 0;
+          }
+          for (int k=0; k<data_i_index.numElements(); ++k)
+          {
+            i=data_i_index(k)+data_ibegin ;
+            if (i>=0 && i < domainMask.size())
+            {
+              if (!domainMask(i)) data_i_index(k) = -1;
+            }
+            else
+              data_i_index(k) = -1;
+
+            if (!domainMask(i)) data_i_index(k) = -1;
           }
         }
@@ -1122 +1154 @@
           data_i_index.resize(data_ni);
           data_j_index.resize(data_ni);
-
-          for (int i = 0; i < data_ni; ++i)
+          data_j_index = 0;
+
+          for (int k = 0; k < data_ni; ++k)
           {
-            data_i_index(i) = i;
-            data_j_index(i) = 0;
+            i=k+data_ibegin ;
+            if (i>=0 && i < domainMask.size())
+            {
+              if (domainMask(i))
+                data_i_index(k) = k;
+              else
+                data_i_index(k) = -1;
+            }
+            else
+              data_i_index(k) = -1;
           }
         }
@@ -1135 +1176 @@
           data_j_index.resize(dsize);
 
-          for(int count = 0, j = 0; j < data_nj; ++j)
+          for(int count = 0, kj = 0; kj < data_nj; ++kj)
           {
-            for(int i = 0; i < data_ni; ++i, ++count)
+            for(int ki = 0; ki < data_ni; ++ki, ++count)
             {
-              data_i_index(count) = i;
-              data_j_index(count) = j;
+              i = ki + data_ibegin;
+              j = kj + data_jbegin;
+              ind=j*ni+i ;
+              if (i>=0 && i<ni && j>=0 && j<nj)
+              {
+                if (domainMask(ind))
+                {
+                  data_i_index(count) = ki;
+                  data_j_index(count) = kj;
+                }
+                else
+                {
+                  data_i_index(count) = -1;
+                  data_j_index(count) = -1;
+                }
+              }
+              else
+              {
+                data_i_index(count) = -1;
+                data_j_index(count) = -1;
+              }
             }
           }
@@ -1976 +2036 @@
     sendDistributionAttributes();
     sendIndex();       
-    sendMask();
+//    sendMask();
     sendLonLat();
     sendArea();    
@@ -2447 +2507 @@
          {
            iIndex = (index%ni_glo)-ibegin;
-           iIndex = (iIndex < 0) ? 0 : iIndex;    // ??
+           iIndex = (iIndex < 0) ? 0 : iIndex;
            jIndex = (index/ni_glo)-jbegin;
-           jIndex = (jIndex < 0) ? 0 : jIndex;    // ??
+           jIndex = (jIndex < 0) ? 0 : jIndex;
            nbIndLoc = iIndex + ni * jIndex;
-           if (nbIndLoc < nbIndexGlobMax)
+//           if (nbIndLoc < nbIndexGlobMax)  // THIS CONDITION IMPEDES THE CASE OF A HOLE
            {
              i_index(nbIndLoc) = index % ni_glo;
@@ -2476 +2536 @@
       j_index.resizeAndPreserve(nbIndGlob);
     }
+
+    domainMask.resize(0); // Mask is not defined anymore on servers
   }
 
@@ -2896 +2958 @@
       buffer >> recvDataJIndex[i];
     }
-
+   
     int nbIndex = i_index.numElements();
     CArray<int,1> dataIIndex(nbIndex), dataJIndex(nbIndex);
     dataIIndex = -1; dataJIndex = -1;
-
+     
     nbIndex = 0;
     for (i = 0; i < nbReceived; ++i)
@@ -2918 +2980 @@
          dataJIndex(lInd) = (-1 == dataJIndex(lInd)) ? tmpJ(ind) : dataJIndex(lInd);  
 
-         if (!domainMask(lInd))   // Include mask info into data index on the RECEIVE getServerDimensionSizes
-         {
-           dataIIndex(lInd) = dataJIndex(lInd) = -1;
-         }
+//         if (!domainMask(lInd))   // Include mask info into data index on the RECEIVE getServerDimensionSizes
+//         {
+//           dataIIndex(lInd) = dataJIndex(lInd) = -1;
+//         }
       } 
     }

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

@@ -693 +693 @@
      CContext* context = CContext::getCurrent();
 
-     CContextClient* client = context->client;  // Here it's not important which contextClient to recuperate
+     CContextClient* client = context->client;
      int rank = client->clientRank;
 
@@ -699 +699 @@
      // Get local data index on client
      int nbStoreIndex = clientDistribution_->getLocalDataIndexOnClient().size();
+     int nbStoreGridMask = clientDistribution_->getLocalMaskIndexOnClient().size();
+     // nbStoreGridMask = nbStoreIndex if grid mask is defined, and 0 otherwise
      storeIndex_client.resize(nbStoreIndex);
-     storeMask_client.resize(nbStoreIndex);
-     for (int idx = 0; idx < nbStoreIndex; ++idx)
-     {
-       storeIndex_client(idx) = (clientDistribution_->getLocalDataIndexOnClient())[idx];
-       storeMask_client(idx) = (clientDistribution_->getLocalMaskIndexOnClient())[idx];
-     }
+     storeMask_client.resize(nbStoreGridMask);
+     for (int idx = 0; idx < nbStoreIndex; ++idx) storeIndex_client(idx) = (clientDistribution_->getLocalDataIndexOnClient())[idx];
+     for (int idx = 0; idx < nbStoreGridMask; ++idx) storeMask_client(idx) = (clientDistribution_->getLocalMaskIndexOnClient())[idx];
 
      if (0 == serverDistribution_) isDataDistributed_= clientDistribution_->isDataDistributed();
@@ -1302 +1301 @@
       const StdSize size = storeIndex_client.numElements();
       stored.resize(size);
-
       const double nanValue = std::numeric_limits<double>::quiet_NaN();
-      for(StdSize i = 0; i < size; i++) stored(i) = (storeMask_client(i)) ? data[storeIndex_client(i)] : nanValue;
+
+      if (storeMask_client.numElements() != 0)
+        for(StdSize i = 0; i < size; i++) stored(i) = (storeMask_client(i)) ? data[storeIndex_client(i)] : nanValue;
+      else
+        for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_client(i)];
    }