Changeset 1794 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

Timestamp:

12/16/19 19:22:59 (5 years ago)

Author:

ymipsl

Message:

• add some comment about grid map/array/indexes
• Add some "_" to suffix data members of the class

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (24 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -695 +695 @@
      int nbStoreGridMask = clientDistribution_->getLocalMaskIndexOnClient().size();
      // nbStoreGridMask = nbStoreIndex if grid mask is defined, and 0 otherwise
-     storeIndex_client.resize(nbStoreIndex);
-     storeMask_client.resize(nbStoreGridMask);
-     for (int idx = 0; idx < nbStoreIndex; ++idx) storeIndex_client(idx) = (clientDistribution_->getLocalDataIndexOnClient())[idx];
-     for (int idx = 0; idx < nbStoreGridMask; ++idx) storeMask_client(idx) = (clientDistribution_->getLocalMaskIndexOnClient())[idx];
+     storeIndex_client_.resize(nbStoreIndex);
+     storeMask_client_.resize(nbStoreGridMask);
+     for (int idx = 0; idx < nbStoreIndex; ++idx) storeIndex_client_(idx) = (clientDistribution_->getLocalDataIndexOnClient())[idx];
+     for (int idx = 0; idx < nbStoreGridMask; ++idx) storeMask_client_(idx) = (clientDistribution_->getLocalMaskIndexOnClient())[idx];
 
      if (0 == serverDistribution_) isDataDistributed_= clientDistribution_->isDataDistributed();
      else
      {
-        // Mapping global index received from clients to the storeIndex_client
+        // Mapping global index received from clients to the storeIndex_client_
         CDistributionClient::GlobalLocalDataMap& globalDataIndex = clientDistribution_->getGlobalDataIndexOnClient();
         CDistributionClient::GlobalLocalDataMap::const_iterator itGloe = globalDataIndex.end();
-        map<int, CArray<size_t, 1> >::iterator itb = outGlobalIndexFromClient.begin(),
-                                               ite = outGlobalIndexFromClient.end(), it;
+        map<int, CArray<size_t, 1> >::iterator itb = outGlobalIndexFromClient_.begin(),
+                                               ite = outGlobalIndexFromClient_.end(), it;
 
         for (it = itb; it != ite; ++it)
         {
           int rank = it->first;
-          CArray<size_t,1>& globalIndex = outGlobalIndexFromClient[rank];
-          outLocalIndexStoreOnClient.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
-          CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient[rank];
+          CArray<size_t,1>& globalIndex = outGlobalIndexFromClient_[rank];
+          outLocalIndexStoreOnClient_.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
+          CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient_[rank];
           size_t nbIndex = 0;
 
@@ -772 +772 @@
             connectedDataSize_.erase(receiverSize);
             globalIndexOnServer_.erase(receiverSize);
-            nbSenders.erase(receiverSize);
+            nbSenders_.erase(receiverSize);
          }
 
@@ -872 +872 @@
          }
 
-         nbSenders[receiverSize] = clientServerMap_->computeConnectedClients(receiverSize, client->clientSize, client->intraComm, connectedServerRank_[receiverSize]);
+         nbSenders_[receiverSize] = clientServerMap_->computeConnectedClients(receiverSize, client->clientSize, client->intraComm, connectedServerRank_[receiverSize]);
        }
      }
@@ -911 +911 @@
        if (serverDistribution_!=0) serverDistribution_->partialClear() ;
        if (clientDistribution_!=0) clientDistribution_->partialClear() ;
-       outGlobalIndexFromClient.clear() ;
+       outGlobalIndexFromClient_.clear() ;
      }
    }
@@ -1310 +1310 @@
    TRY
    {
-      const StdSize size = storeIndex_client.numElements();
+      const StdSize size = storeIndex_client_.numElements();
 
       stored.resize(size);
-      for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_client(i)];
+      for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_client_(i)];
    }
    CATCH
@@ -1320 +1320 @@
    TRY
    {
-      const StdSize size = storeIndex_client.numElements();
-
-      for(StdSize i = 0; i < size; i++) data[storeIndex_client(i)] = stored(i);
+      const StdSize size = storeIndex_client_.numElements();
+
+      for(StdSize i = 0; i < size; i++) data[storeIndex_client_(i)] = stored(i);
    }
    CATCH
@@ -1328 +1328 @@
    void CGrid::maskField_arr(const double* const data, CArray<double, 1>& stored) const
    {
-      const StdSize size = storeIndex_client.numElements();
+      const StdSize size = storeIndex_client_.numElements();
       stored.resize(size);
       const double nanValue = std::numeric_limits<double>::quiet_NaN();
 
-      if (storeMask_client.numElements() != 0)
-        for(StdSize i = 0; i < size; i++) stored(i) = (storeMask_client(i)) ? data[storeIndex_client(i)] : nanValue;
+      if (storeMask_client_.numElements() != 0)
+        for(StdSize i = 0; i < size; i++) stored(i) = (storeMask_client_(i)) ? data[storeIndex_client_(i)] : nanValue;
       else
-        for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_client(i)];
+        for(StdSize i = 0; i < size; i++) stored(i) = data[storeIndex_client_(i)];
    }
 
@@ -1356 +1356 @@
       clientDistribution_ = new CDistributionClient(rank, this);
 
-      storeIndex_client.resize(1);
-      storeIndex_client(0) = 0;      
+      storeIndex_client_.resize(1);
+      storeIndex_client_(0) = 0;      
 
       if (0 != serverDistribution_)
       {
-        map<int, CArray<size_t, 1> >::iterator itb = outGlobalIndexFromClient.begin(),
-                                               ite = outGlobalIndexFromClient.end(), it;
+        map<int, CArray<size_t, 1> >::iterator itb = outGlobalIndexFromClient_.begin(),
+                                               ite = outGlobalIndexFromClient_.end(), it;
         for (it = itb; it != ite; ++it)
         {
           int rank = it->first;
-          CArray<size_t,1>& globalIndex = outGlobalIndexFromClient[rank];
-          outLocalIndexStoreOnClient.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
-          CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient[rank];
+          CArray<size_t,1>& globalIndex = outGlobalIndexFromClient_[rank];
+          outLocalIndexStoreOnClient_.insert(make_pair(rank, CArray<size_t,1>(globalIndex.numElements())));
+          CArray<size_t,1>& localIndex = outLocalIndexStoreOnClient_[rank];
           if (1 != globalIndex.numElements())
             ERROR("void CGrid::computeClientIndexScalarGrid()",
@@ -1406 +1406 @@
           connectedDataSize_.erase(receiverSize);
           globalIndexOnServer_.erase(receiverSize);
-          nbSenders.erase(receiverSize);
+          nbSenders_.erase(receiverSize);
         }
 
@@ -1418 +1418 @@
             connectedServerRank_[receiverSize].push_back(rank);
             connectedDataSize_[receiverSize][rank] = nb;
-            nbSenders[receiverSize][rank] = nb;
+            nbSenders_[receiverSize][rank] = nb;
           }
         }
@@ -1430 +1430 @@
             connectedServerRank_[receiverSize].push_back(rank);
             connectedDataSize_[receiverSize][rank] = nb;
-            nbSenders[receiverSize][rank] = nb;
+            nbSenders_[receiverSize][rank] = nb;
           }
         }
@@ -1443 +1443 @@
   {
     CContext* context = CContext::getCurrent();
-    storeIndex_toSrv.clear();
+    storeIndex_toSrv_.clear();
     std::list<CContextClient*>::iterator it;
 
@@ -1462 +1462 @@
           int rank = *itRank;
           int nb = 1;
-          storeIndex_toSrv[client].insert(std::make_pair(rank, CArray<int,1>(nb)));
+          storeIndex_toSrv_[client].insert(std::make_pair(rank, CArray<int,1>(nb)));
           listOutIndex.push_back(CArray<size_t,1>(nb));
 
-          CArray<int, 1>& outLocalIndexToServer = storeIndex_toSrv[client][rank];
+          CArray<int, 1>& outLocalIndexToServer = storeIndex_toSrv_[client][rank];
           CArray<size_t, 1>& outGlobalIndexOnServer = listOutIndex.back();
 
@@ -1475 +1475 @@
 
           if (context->hasClient && !context->hasServer)
-            storeIndex_fromSrv.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
+            storeIndex_fromSrv_.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
 
           listMsg.push_back(CMessage());
@@ -1498 +1498 @@
 
           if (context->hasClient && !context->hasServer)
-            storeIndex_fromSrv.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
+            storeIndex_fromSrv_.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
         }
         client->sendEvent(event);
@@ -1510 +1510 @@
   {
     CContext* context = CContext::getCurrent();
-    storeIndex_toSrv.clear();
+    storeIndex_toSrv_.clear();
     std::list<CContextClient*>::iterator it;
 
@@ -1543 +1543 @@
           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
           {
-            storeIndex_toSrv[client].insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
+            storeIndex_toSrv_[client].insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
             if (context->hasClient && !context->hasServer)
-              storeIndex_fromSrv.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
+              storeIndex_fromSrv_.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
             
             listOutIndex.push_back(CArray<size_t,1>(outGlobalIndexOnServer));
@@ -1568 +1568 @@
            for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
            {
-             storeIndex_fromSrv.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
+             storeIndex_fromSrv_.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
            }
            client->sendEvent(event);
@@ -1604 +1604 @@
             nb = globalIndexTmp[rank].size();
 
-          storeIndex_toSrv[client].insert(make_pair(rank, CArray<int,1>(nb)));
+          storeIndex_toSrv_[client].insert(make_pair(rank, CArray<int,1>(nb)));
           listOutIndex.push_back(CArray<size_t,1>(nb));
 
-          CArray<int, 1>& outLocalIndexToServer = storeIndex_toSrv[client][rank];
+          CArray<int, 1>& outLocalIndexToServer = storeIndex_toSrv_[client][rank];
           CArray<size_t, 1>& outGlobalIndexOnServer = listOutIndex.back();
 
@@ -1616 +1616 @@
           }
 
-          storeIndex_fromSrv.insert(make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
+          storeIndex_fromSrv_.insert(make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
           listMsg.push_back(CMessage());
           listMsg.back() << getId() << isDataDistributed_ << isCompressible_ << listOutIndex.back();
 
-          event.push(rank, nbSenders[receiverSize][rank], listMsg.back());
+          event.push(rank, nbSenders_[receiverSize][rank], listMsg.back());
         }
 
@@ -1654 +1654 @@
     connectedServerRankRead_ = ranks;
 
-    nbReadSenders.clear();
+    nbReadSenders_.clear();
     CContextServer* server = context->server  ;
     CContextClient* client = context->client;   
@@ -1750 +1750 @@
       CArray<size_t,1> outIndex;
       buffer >> outIndex;
-      outGlobalIndexFromClient.insert(std::make_pair(rank, outIndex));
+      outGlobalIndexFromClient_.insert(std::make_pair(rank, outIndex));
       connectedDataSizeRead_[rank] = outIndex.numElements();
 
@@ -1811 +1811 @@
     if (isScalarGrid()) return;
 
-    nbReadSenders[client] = CClientServerMappingDistributed::computeConnectedClients(context->client->serverSize, context->client->clientSize, context->client->intraComm, ranks);
+    nbReadSenders_[client] = CClientServerMappingDistributed::computeConnectedClients(context->client->serverSize, context->client->clientSize, context->client->intraComm, ranks);
 
   }
@@ -1975 +1975 @@
   TRY
   {
+    // This function is now useless because it will return false only if server and client size are equal to 1
+    // to be seriously check in future 
+
     if (isScalarGrid()) return false;
     else if (0 != client)