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

Timestamp:

02/17/17 19:51:36 (7 years ago)

Author:

oabramkina

Message:

dev: intermediate commit.

File:

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

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

@@ -630 +630 @@
      computeClientIndex();
      if (context->hasClient)
-      computeConnectedClients();
+     {
+       computeConnectedClients();
+     }
 
 
@@ -792 +794 @@
          }
 
-         nbIndexOnServer = 0;
-         for (it = itb; it != ite; ++it)
+//         nbIndexOnServer = 0;
+//         for (it = itb; it != ite; ++it)
+//         {
+//           const std::vector<int>& tmp = it->second;
+//           nbIndexOnServerTmp = 0;
+//           for (int i = 0; i < tmp.size(); ++i)
+//           {
+//             if (0 == nbIndexOnServerTmp(tmp[i]))
+//             {
+//               globalElementIndexOnServer[idx][tmp[i]][nbIndexOnServer(tmp[i])] = it->first;
+//               ++nbIndexOnServerTmp(tmp[i]);
+//             }
+//           }
+//           nbIndexOnServer += nbIndexOnServerTmp;
+//         }
+//       }
+
+       nbIndexOnServer = 0;
+//       for (it = itb; it != ite; ++it)
+       for (size_t j = 0; j < globalIndexElementOnServerMap.size(); ++j)
+       {
+         it = globalIndexElementOnServerMap.find(globalIndexElementOnClient(j));
+         if (it != ite)
          {
            const std::vector<int>& tmp = it->second;
@@ -808 +831 @@
          }
        }
+     }
 
       // Determine server which contain global source index
@@ -1236 +1260 @@
     // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
     int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-    for (int i = 0; i < nbSrvPools; ++i)
-    {
-      CContextClient* client = context->hasServer ? context->clientPrimServer[i] : context->client ;
+    for (int p = 0; p < nbSrvPools; ++p)
+    {
+      CContextClient* client = context->hasServer ? context->clientPrimServer[p] : context->client ;
 
       CEventClient event(getType(), EVENT_ID_INDEX);
@@ -1397 +1421 @@
     int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
     nbSrvPools = 1;
-    for (int i = 0; i < nbSrvPools; ++i)
-    {
-      CContextServer* server = (context->hasServer) ? context->server : context->serverPrimServer[i];
-      CContextClient* client = (context->hasServer) ? context->client : context->clientPrimServer[i];
+    for (int p = 0; p < nbSrvPools; ++p)
+    {
+      CContextServer* server = (!context->hasClient) ? context->server : context->serverPrimServer[p];
+      CContextClient* client = (!context->hasClient) ? context->client : context->clientPrimServer[p];
+//      CContextServer* server = (context->hasServer) ? context->server : context->serverPrimServer[p];
+//      CContextClient* client = (context->hasServer) ? context->client : context->clientPrimServer[p];
       numberWrittenIndexes_ = totalNumberWrittenIndexes_ = offsetWrittenIndexes_ = 0;
       connectedServerRank_ = ranks;
@@ -1503 +1529 @@
         else
         {
-          dataSize = outIndex.numElements();
-          for (int i = 0; i < outIndex.numElements(); ++i) outIndex(i) = i;
+//          dataSize = outIndex.numElements();
+//          for (int i = 0; i < outIndex.numElements(); ++i) outIndex(i) = i;
+          // THE PROBLEM HERE IS THAT DATA CAN BE NONDISTRIBUTED ON CLIENT AND DISTRIBUTED ON SERVER
+          // BELOW IS THE TEMPORARY FIX only for a single type of element (domain, asix, scalar)
+          dataSize = serverDistribution_->getGlobalIndexEachDimension()[0].numElements();
+          outIndex.resize(dataSize);
+          outIndex = serverDistribution_->getGlobalIndexEachDimension()[0];
+
         }
         writtenDataSize_ += dataSize;