Changeset 1235 for XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

Timestamp:

08/03/17 15:50:40 (7 years ago)

Author:

mhnguyen

Message:

Fixing a bug on writting axis label

+) Axis label is correctly processed before being written
+) Do some code cleaning and add some comments

Test
+) On Curie
+) OK

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp (modified) (7 diffs)

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

@@ -659 +659 @@
 
             
-            if (nbIndex != localIndex.numElements())
+            if (doGridHaveDataDistributed(client) && (nbIndex != localIndex.numElements()))
                  ERROR("void CGrid::computeClientIndex()",
                     << "Number of local index on client is different from number of received global index" 
@@ -698 +698 @@
        connectedServerRank_[p].clear();
 
-       if (!doGridHaveDataDistributed())
+       if (!doGridHaveDataDistributed(client))
        {
           if (client->isServerLeader())
@@ -769 +769 @@
        if (connectedServerRank_[p].empty())
         connectedServerRank_[p].push_back(client->clientRank % client->serverSize);
-      
+
        nbSenders[p] = clientServerMap_->computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_[p]);
      }
@@ -1373 +1373 @@
       itIndex = itbIndex;                                                              
 
-      if (!doGridHaveDataDistributed())
+      if (!doGridHaveDataDistributed(client))
       {
         if (client->isServerLeader())
@@ -1593 +1593 @@
           for (int i = 0; i < nZoomSize.size(); ++i)
             dataSize *= nZoomSize[i];
-          // serverDistribution_ = new CDistributionServer(server->intraCommRank, nZoomBegin, nZoomSize,
-          //                                               nZoomBeginGlobal, nGlob);
           serverDistribution_ = new CDistributionServer(server->intraCommRank, 
                                                         globalZoomIndex, axis_domain_order,
@@ -1604 +1602 @@
         outGlobalIndexFromClient.insert(std::make_pair(rank, outIndex));        
 
-        if (isDataDistributed_)
+        if (doGridHaveDataDistributed(client))
         {}
         else
@@ -1827 +1825 @@
   }
 
-  bool CGrid::doGridHaveDataDistributed()
+  bool CGrid::doGridHaveDataDistributed(CContextClient* client)
   {
     if (isScalarGrid()) return false;
+    else if (0 != client)
+    {
+      return  (isDataDistributed_ ||  (1 != client->clientSize) || (1 != client->serverSize));
+    }
     else
-      return isDataDistributed_;
+      return isDataDistributed_;    
   }