Changeset 1030 for XIOS/dev/dev_olga/src/node/domain.cpp

Timestamp:

01/20/17 16:17:57 (7 years ago)

Author:

oabramkina

Message:

dev: intermediate commit.

File:

• XIOS/dev/dev_olga/src/node/domain.cpp (modified) (11 diffs)

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

@@ -1442 +1442 @@
     CContext* context = CContext::getCurrent();
      // Use correct context client to send message
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
-       CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i]
+      CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i]
                                                                          : context->client;    
       int nbServer = contextClientTmp->serverSize;
-    std::vector<int> nGlobDomain(2);
-    nGlobDomain[0] = this->ni_glo;
-    nGlobDomain[1] = this->nj_glo;
-
-    CServerDistributionDescription serverDescription(nGlobDomain, nbServer);
+      std::vector<int> nGlobDomain(2);
+      nGlobDomain[0] = this->ni_glo;
+      nGlobDomain[1] = this->nj_glo;
+
+      CServerDistributionDescription serverDescription(nGlobDomain, nbServer);
       if (isUnstructed_) serverDescription.computeServerDistribution(false, 0);
       else serverDescription.computeServerDistribution(false, 1);
@@ -1495 +1496 @@
   {
     CContext* context=CContext::getCurrent() ;
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
@@ -1666 +1668 @@
       for (it = globalIndexDomainOnServer.begin(); it != ite; ++it) {
         connectedServerRank_.push_back(it->first);
+//        std::vector<size_t> vec = it->second;
+//        std::sort(vec.begin(), vec.end());
+//        indSrv_[it->first] = vec;
       }
 
@@ -1710 +1715 @@
     int ns, n, i, j, ind, nv, idx;
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
@@ -1780 +1786 @@
     int ns, n, i, j, ind, nv, idx;
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
@@ -1826 +1833 @@
     int ns, n, i, j, ind, nv, idx;
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
@@ -1875 +1883 @@
     int ns, n, i, j, ind, nv, idx;
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
@@ -1960 +1969 @@
     int ns, n, i, j, ind, nv, idx;
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
+    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     for (int i = 0; i < nbSrvPools; ++i)
     {
@@ -2150 +2160 @@
       {
          index = tmp(ind);
-         i_index(nbIndGlob) = index / ni_glo;
-         j_index(nbIndGlob) = index % ni_glo;
+         i_index(nbIndGlob) = index % ni_glo;
+         j_index(nbIndGlob) = index / ni_glo;
          ++nbIndGlob;
       } 
@@ -2172 +2182 @@
       {
          index = tmp(ind);
-         zoom_i_index(nbZoomInd) = index / ni_glo;
-         zoom_j_index(nbZoomInd) = index % ni_glo;
+         zoom_i_index(nbZoomInd) = index % ni_glo;
+         zoom_j_index(nbZoomInd) = index / ni_glo;
          ++nbZoomInd;
       } 
@@ -2201 +2211 @@
         count_write_index_[0] = nbIZoom;
         count_write_index_[1] = nbJZoom;
+
+        // Reoder the zoom_index
+        for (int j = 0; j < nbJZoom; ++j)
+          for (int i = 0; i < nbIZoom; ++i)
+          {
+            idx = nbIZoom * j + i;
+            if (idx < ni_zoom)
+            {
+              zoom_i_index(idx) = ibegin + i;
+              zoom_j_index(idx) = jbegin + j;
+            }
+          }  
+
+        // Reorder the global index
+        for (int j = 0; j < nj; ++j)
+          for (int i = 0; i < ni; ++i)
+          {
+            idx = ni * j + i;
+            if (idx < nbIndGlob)
+            {
+              i_index(idx) = ibegin + i;
+              j_index(idx) = jbegin + j;
+            }
+          }         
       }