Changeset 668 for XIOS/trunk/src/distribution_client.cpp

Timestamp:

08/24/15 14:53:36 (9 years ago)

Author:

mhnguyen

Message:

Implementing some code factoring

+) Replace some slow searching function by faster ones

Test
+) On Curie
+) test_client and test_complete are correct

File:

• XIOS/trunk/src/distribution_client.cpp (modified) (8 diffs)

XIOS/trunk/src/distribution_client.cpp

@@ -18 +18 @@
    , gridMask_(), localDomainIndex_(), localAxisIndex_(), indexMap_(), indexDomainData_(), indexAxisData_()
    , isDataDistributed_(true), axisNum_(0), domainNum_(0), nIndexDomain_(), nIndexAxis_()
+   , globalDataSendToServer_(), localDataIndexSendToServer_(), localDataIndex_(), localMaskIndex_()
 {
 }
@@ -28 +29 @@
    , gridMask_(), localDomainIndex_(), localAxisIndex_(), indexMap_(), indexDomainData_(), indexAxisData_()
    , isDataDistributed_(true), axisNum_(0), domainNum_(0), nIndexDomain_(), nIndexAxis_()
+   , globalDataSendToServer_(), localDataIndexSendToServer_(), localDataIndex_(), localMaskIndex_()
 {
   readDistributionInfo(grid);
@@ -568 +570 @@
           gridMask_(gridMaskIndex))
       {
-        localDataIndex_(indexLocalDataOnClientCount) = countLocalData;
+        localDataIndex_[indexLocalDataOnClientCount] = countLocalData;
 
         bool isIndexOnServer = true;
@@ -584 +586 @@
             globalIndex += (currentIndex[k] + nBeginGlobal_[k])*mulDim;
           }
-          globalDataSendToServer_(indexSend2ServerCount) = globalIndex;
-          localDataIndexSendToServer_(indexSend2ServerCount) = indexLocalDataOnClientCount;
-          localMaskIndex_(indexSend2ServerCount) = gridMaskIndex;
+          globalDataSendToServer_[indexSend2ServerCount] = globalIndex;
+          localDataIndexSendToServer_[indexSend2ServerCount] = indexLocalDataOnClientCount;
+          localMaskIndex_[indexSend2ServerCount] = gridMaskIndex;
           ++indexSend2ServerCount;
         }
@@ -639 +641 @@
 }
 
-const CArray<size_t,1>& CDistributionClient::getGlobalDataIndexSendToServer() const
+const std::vector<size_t>& CDistributionClient::getGlobalDataIndexSendToServer() const
 {
   return globalDataSendToServer_;
@@ -647 +649 @@
   Return local data index of client
 */
-const CArray<int,1>& CDistributionClient::getLocalDataIndexOnClient() const
+const std::vector<int>& CDistributionClient::getLocalDataIndexOnClient() const
 {
   return localDataIndex_;
@@ -655 +657 @@
   Return local mask index of client
 */
-const CArray<int,1>& CDistributionClient::getLocalMaskIndexOnClient() const
+const std::vector<int>& CDistributionClient::getLocalMaskIndexOnClient() const
 {
   return localMaskIndex_;
@@ -663 +665 @@
   Return local data index on client which are sent to servers
 */
-const CArray<int,1>& CDistributionClient::getLocalDataIndexSendToServer() const
+const std::vector<int>& CDistributionClient::getLocalDataIndexSendToServer() const
 {
   return localDataIndexSendToServer_;