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

Timestamp:

09/06/18 18:55:44 (6 years ago)

Author:

oabramkina

Message:

Taking care of cases when a process doesn't possess a grid (its domain or axe size is zero).

Tested with CMIP6 toy models and IPSL model.

To do: remove grid mask from transformations.

File:

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

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

@@ -1848 +1848 @@
           // Even if a client has no index, it must connect to at least one server and
           // send an "empty" data to this server
+//          if (connectedServerRank_[nbServer].empty())
+//            connectedServerRank_[nbServer].push_back(client->clientRank % client->serverSize);
+
+          // Trying instead: send empty data to all servers
           if (connectedServerRank_[nbServer].empty())
-            connectedServerRank_[nbServer].push_back(client->clientRank % client->serverSize);
+            for (int i = 0; i < client->serverSize; ++i)
+            connectedServerRank_[nbServer].push_back(i);
+
 
           nbSenders[nbServer] = clientServerMap->computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_[nbServer]);
@@ -1904 +1910 @@
         {
           localIndexToWriteOnServer(nbWritten) = globalLocalIndexMap_[indGlo];
-          ++nbWritten;
         }
         else
         {
-          localIndexToWriteOnServer(nbWritten) = 0;
-          ++nbWritten;
-        }
+          localIndexToWriteOnServer(nbWritten) = -1;
+        }
+        ++nbWritten;
       }
       
@@ -2512 +2517 @@
            nbIndLoc = iIndex + ni * jIndex;
 //           if (nbIndLoc < nbIndexGlobMax)  // THIS CONDITION IMPEDES THE CASE OF A HOLE
-           {
-             i_index(nbIndLoc) = index % ni_glo;
-             j_index(nbIndLoc) = index / ni_glo;
-             globalLocalIndexMap_[index] = nbIndLoc;  
-             ++nbIndGlob;
-           }
-           // i_index(nbIndGlob) = index % ni_glo;
-           // j_index(nbIndGlob) = index / ni_glo;
-           // globalLocalIndexMap_[index] = nbIndGlob;  
-           // ++nbIndGlob;
+//           {
+//             i_index(nbIndLoc) = index % ni_glo;
+//             j_index(nbIndLoc) = index / ni_glo;
+//             globalLocalIndexMap_[index] = nbIndLoc;
+//             ++nbIndGlob;
+//           }
+            i_index(nbIndGlob) = index % ni_glo;
+            j_index(nbIndGlob) = index / ni_glo;
+            globalLocalIndexMap_[index] = nbIndGlob;
+            ++nbIndGlob;
          } 
       }