Changeset 1624 for XIOS/branchs/xios-2.5/src/node/axis.cpp

Timestamp:

12/14/18 11:20:33 (5 years ago)

Author:

oabramkina

Message:

Bugfix for NEMO-like land processes elimination.

Values describing a domain (latitude, longitude, bounds,...) are set to -1 on land processes.

File:

• XIOS/branchs/xios-2.5/src/node/axis.cpp (modified) (6 diffs)

XIOS/branchs/xios-2.5/src/node/axis.cpp

@@ -657 +657 @@
           connectedServerRank_[nbServer].push_back(client->clientRank % client->serverSize);
 
-         nbSenders[nbServer] = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_[nbServer]);
+        nbSenders[nbServer] = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_[nbServer]);
 
         delete clientServerMap;
@@ -703 +703 @@
         }                 
       }
+
+//    localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
+//    nbWritten = 0;
+//    for (itSrv = itSrvb; itSrv != itSrve; ++itSrv)
+//    {
+//      indGlo = *itSrv;
+//      if (ite != globalLocalIndexMap_.find(indGlo))
+//      {
+//        localIndexToWriteOnServer(nbWritten) = globalLocalIndexMap_[indGlo];
+//      }
+//      else
+//      {
+//        localIndexToWriteOnServer(nbWritten) = -1;
+//      }
+//      ++nbWritten;
+//    }
 
       localIndexToWriteOnServer.resize(writtenGlobalIndex.numElements());
@@ -1293 +1309 @@
          if (0 == globalLocalIndexMap_.count(gloInd))
          {
-           index(nbIndLoc) = gloInd % n_glo;           
-           globalLocalIndexMap_[gloInd] = nbIndLoc;  
+           index(nbIndexGlob) = gloInd % n_glo;
+           globalLocalIndexMap_[gloInd] = nbIndexGlob;
+//           index(nbIndLoc) = gloInd % n_glo; 
+//           globalLocalIndexMap_[gloInd] = nbIndLoc;  
            ++nbIndexGlob;
          } 
@@ -1345 +1363 @@
     }
     
-    int nbCompressedData = 0; 
+    int nbCompressedData = 0;
     for (idx = 0; idx < nonCompressedData.numElements(); ++idx)
     {
       if (0 <= nonCompressedData(idx))
-        ++nbCompressedData;        
+        ++nbCompressedData;
     }
 
@@ -1359 +1377 @@
       {
         data_index(nbCompressedData) = idx % n;
-        ++nbCompressedData;        
+        ++nbCompressedData;
       }
     }
@@ -1476 +1494 @@
       clientsSet.insert(contextClient);
     }
-}
+  }
 
   void CAxis::parse(xml::CXMLNode & node)