Changeset 1070 for XIOS/dev/branch_yushan/src/node/domain.cpp

Timestamp:

03/09/17 18:31:07 (7 years ago)

Author:

yushan

Message:

Preperation for merge from trunk

File:

• XIOS/dev/branch_yushan/src/node/domain.cpp (modified) (5 diffs)

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

@@ -1303 +1303 @@
    void CDomain::checkAttributesOnClientAfterTransformation()
    {
-     int myRank;
-     MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
-
-     CContext* context=CContext::getCurrent() ;  //printf("myRank = %d, CContext::getCurrent OK\n", myRank);
-
-     //printf("myRank = %d, this->isClientAfterTransformationChecked = %d\n", myRank, this->isClientAfterTransformationChecked);
+     
+     CContext* context=CContext::getCurrent() ;
+
      if (this->isClientAfterTransformationChecked) return;
-     //printf("myRank = %d, context->hasClient = %d\n", myRank, context->hasClient);
      if (context->hasClient)
      {
-       this->checkMask();  //printf("myRank = %d, this->checkMask OK\n", myRank);
-       //printf("myRank = %d, hasLonLat = %d, hasArea = %d, isCompressible_ = %d\n", myRank, hasLonLat, hasArea, isCompressible_);
+       this->checkMask(); 
        if (hasLonLat || hasArea || isCompressible_) 
         {
-          //printf("myRank = %d, start this->computeConnectedServer\n", myRank);
           this->computeConnectedServer();
-          //printf("myRank = %d, this->computeConnectedServer OK\n", myRank);
-        }
-       //printf("myRank = %d, hasLonLat = %d\n", myRank, hasLonLat);
+        }
        if (hasLonLat) 
         {
           this->completeLonLatClient();
-          //printf("myRank = %d, this->completeLonLatClient OK\n", myRank);
         }
      }
@@ -1460 +1451 @@
   void CDomain::computeConnectedServer(void)
   {
-    int myRank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
 
     CContext* context=CContext::getCurrent() ;
@@ -1576 +1565 @@
     else serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 1);
 
-    //printf("myRank = %d, check 7 OK\n", myRank);
-
     CClientServerMapping* clientServerMap = new CClientServerMappingDistributed(serverDescription.getGlobalIndexRange(),
                                                                                 client->intraComm);
-    //printf("myRank = %d new OK\n", myRank);
-
     clientServerMap->computeServerIndexMapping(globalIndexDomain);  
-    //printf("myRank = %d, clientServerMap->computeServerIndexMapping(globalIndexDomain) OK\n", myRank);
     
     const CClientServerMapping::GlobalIndexMap& globalIndexDomainOnServer = clientServerMap->getGlobalIndexOnServer();
-    //printf("myRank = %d, clientServerMap->getGlobalIndexOnServer OK\n", myRank);
     
-    //printf("myRank = %d, check 8 OK\n", myRank);
-
     CClientServerMapping::GlobalIndexMap::const_iterator it  = globalIndexDomainOnServer.begin(),
                                                          ite = globalIndexDomainOnServer.end();
@@ -1622 +1603 @@
     }
 
-    //printf("myRank = %d, check 9 OK\n", myRank);
-
     connectedServerRank_.clear();
     for (it = globalIndexDomainOnServer.begin(); it != ite; ++it) {
@@ -1632 +1611 @@
 
     delete clientServerMap;
-    //printf("myRank = %d, check 10 OK\n", myRank);
   }