Changeset 1021 for XIOS/dev/dev_olga/src/node/grid.cpp

Timestamp:

01/10/17 14:36:29 (7 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

• XIOS/dev/dev_olga/src/node/grid.cpp (modified) (8 diffs)

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

@@ -299 +299 @@
          }
 
-         this->isChecked = true;
+//         this->isChecked = true;
+         if (!(this->hasTransform() && !this->isTransformed()))
+          this->isChecked = true;
          return;
        }
@@ -316 +318 @@
           this->computeIndex();
        }
-       this->isChecked = true;
+//       this->isChecked = true;
+       if (!(this->hasTransform() && !this->isTransformed()))
+        this->isChecked = true;
+
+       if (!(this->hasTransform() && (!this->isGenerated())))
+        this->isChecked = true;
      }
    }
@@ -1094 +1101 @@
           }
 
+          storeIndex_fromSrv.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
           listMsg.push_back(CMessage());
           listMsg.back() << getId( )<< isDataDistributed_ << isCompressible_ << listOutIndex.back();
@@ -1102 +1110 @@
       }
       else
+      {
+        const std::list<int>& ranks = client->getRanksServerNotLeader();
+        for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+        {
+          int rank = *itRank;
+          int nb = 1;
+          storeIndex_fromSrv.insert(std::make_pair(rank, CArray<int,1>(nb)));
+          CArray<int, 1>& outLocalIndexToServer = storeIndex_fromSrv[rank];
+          for (int k = 0; k < nb; ++k)
+          {
+            outLocalIndexToServer(k)  = 0;
+          }
+        }
         client->sendEvent(event);
+      }
     }
   }
@@ -1136 +1158 @@
           }
 
-          //int nbClient = client->clientSize; // This stupid variable signals the servers the number of client connect to them
           const std::list<int>& ranks = client->getRanksServerLeader();
           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
           {
             storeIndex_toSrv.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
+            storeIndex_fromSrv.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
             listOutIndex.push_back(CArray<size_t,1>(outGlobalIndexOnServer));
 
@@ -1151 +1173 @@
         }
         else
-          client->sendEvent(event);
+        {
+           int indexSize = globalLocalIndexSendToServer.size();
+           CArray<int,1> outLocalIndexToServer(indexSize);
+           for (int idx = 0; itIndex != iteIndex; ++itIndex, ++idx)
+           {
+             outLocalIndexToServer(idx) = itIndex->second;
+           }
+
+           const std::list<int>& ranks = client->getRanksServerNotLeader();
+           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+           {
+             storeIndex_fromSrv.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
+           }
+           client->sendEvent(event);
+         }
       }
       else
@@ -1177 +1213 @@
         }
 
-//        for (int ns = 0; ns < connectedServerRank_.size(); ++ns)
-        for (int ns = 0; ns < client->serverSize; ++ns)
+        for (int ns = 0; ns < connectedServerRank_.size(); ++ns)
+//        for (int ns = 0; ns < client->serverSize; ++ns)
         {
           rank = connectedServerRank_[ns];
@@ -1197 +1233 @@
           }
 
+          storeIndex_fromSrv.insert(make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
           listMsg.push_back(CMessage());
           listMsg.back() << getId() << isDataDistributed_ << isCompressible_ << listOutIndex.back();