Changeset 1070 for XIOS/dev/branch_yushan/src/node

Timestamp:

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

Author:

yushan

Message:

Preperation for merge from trunk

Location:

XIOS/dev/branch_yushan/src/node

Files:

• context.cpp (modified) (4 diffs)
• domain.cpp (modified) (5 diffs)
• field.cpp (modified) (3 diffs)
• grid.cpp (modified) (3 diffs)

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

@@ -390 +390 @@
    void CContext::closeDefinition(void)
    {
-     int myRank;
-     MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
-
-     //printf("myRank = %d, hasClient = %d, hasServer = %d\n", myRank, hasClient, hasServer);
 
      // There is nothing client need to send to server
@@ -400 +396 @@
        // After xml is parsed, there are some more works with post processing
        postProcessing(); 
-       //printf("myRank = %d,                postProcessing OK\n", myRank);
-     }
-     setClientServerBuffer(); //printf("myRank = %d, setClientServerBuffer OK\n", myRank);
-
-     //printf("hasClient = %d, hasServer = %d\n", hasClient, hasServer);
+     }
+     setClientServerBuffer(); 
 
      if (hasClient && !hasServer)
      {
       // Send all attributes of current context to server
-      this->sendAllAttributesToServer(); //printf("myRank = %d, this->sendAllAttributesToServer OK\n", myRank);
+      this->sendAllAttributesToServer();
 
       // Send all attributes of current calendar
       CCalendarWrapper::get(CCalendarWrapper::GetDefName())->sendAllAttributesToServer();
-      //printf("myRank = %d, CCalendarWrapper::get(CCalendarWrapper::GetDefName())->sendAllAttributesToServer OK\n", myRank);
 
       // We have enough information to send to server
       // First of all, send all enabled files
-       sendEnabledFiles();  //printf("myRank = %d, sendEnabledFiles OK\n", myRank);
+       sendEnabledFiles(); 
 
       // Then, send all enabled fields
-       sendEnabledFields();  //printf("myRank = %d, sendEnabledFields OK\n", myRank);
+       sendEnabledFields(); 
 
       // At last, we have all info of domain and axis, then send them
-       sendRefDomainsAxis();  //printf("myRank = %d, sendRefDomainsAxis OK\n", myRank);
-
+       sendRefDomainsAxis(); 
       // After that, send all grid (if any)
-       sendRefGrid(); //printf("myRank = %d, sendRefGrid OK\n", myRank);
+       sendRefGrid(); 
     }
 
@@ -435 +426 @@
     if (hasClient)
     {
-      this->buildFilterGraphOfEnabledFields();  //printf("myRank = %d, buildFilterGraphOfEnabledFields OK\n", myRank);
-      buildFilterGraphOfFieldsWithReadAccess();  //printf("myRank = %d, buildFilterGraphOfFieldsWithReadAccess OK\n", myRank);
-      this->solveAllRefOfEnabledFields(true);  //printf("myRank = %d, solveAllRefOfEnabledFields OK\n", myRank);
+      this->buildFilterGraphOfEnabledFields();  
+      buildFilterGraphOfFieldsWithReadAccess();  
+      this->solveAllRefOfEnabledFields(true); 
     }
 
@@ -448 +439 @@
     if (hasClient)
     {
-      sendCreateFileHeader();  //printf("myRank = %d, sendCreateFileHeader OK\n", myRank);
-
-      startPrefetchingOfEnabledReadModeFiles();  //printf("myRank = %d, startPrefetchingOfEnabledReadModeFiles OK\n", myRank);
+      sendCreateFileHeader(); 
+
+      startPrefetchingOfEnabledReadModeFiles();  
     }
    }

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);
   }
 

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

@@ -621 +621 @@
    void CField::solveAllReferenceEnabledField(bool doSending2Server)
    {
-     int myRank;
-     MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
-
-     CContext* context = CContext::getCurrent();  //printf("my_Rank = %d, CContext* context = CContext::getCurrent OK\n", myRank);
-     solveOnlyReferenceEnabledField(doSending2Server);  //printf("my_Rank = %d, solveOnlyReferenceEnabledField(doSending2Server) OK\n", myRank);
+
+     CContext* context = CContext::getCurrent(); 
+     solveOnlyReferenceEnabledField(doSending2Server);
 
      if (!areAllReferenceSolved)
@@ -633 +631 @@
         if (context->hasClient)
         {
-          solveRefInheritance(true);  //printf("my_Rank = %d, solveRefInheritance(true) OK\n", myRank);
+          solveRefInheritance(true);  
           if (hasDirectFieldReference()) 
           {
             getDirectFieldReference()->solveAllReferenceEnabledField(false); 
-            //printf("my_Rank = %d, getDirectFieldReference()->solveAllReferenceEnabledField(false) OK\n", myRank);
+            
           }
         }
@@ -643 +641 @@
         {
           solveServerOperation();
-          //printf("my_Rank = %d, solveServerOperation OK\n", myRank);
+          
         }
 
-        solveGridReference();  //printf("my_Rank = %d, solveGridReference OK\n", myRank);
-     }
-
-     solveGridDomainAxisRef(doSending2Server);  //printf("my_Rank = %d, solveGridDomainAxisRef(doSending2Server) OK\n", myRank);
+        solveGridReference();  
+     }
+
+     solveGridDomainAxisRef(doSending2Server); 
 
      if (context->hasClient)
      {
-       solveTransformedGrid();  //printf("my_Rank = %d, solveTransformedGrid OK\n", myRank);
-     }
-
-     solveCheckMaskIndex(doSending2Server);  //printf("FIELD.CPP: my_Rank = %d, solveCheckMaskIndex(doSending2Server) OK\n", myRank);
+       solveTransformedGrid(); 
+     }
+
+     solveCheckMaskIndex(doSending2Server); 
    }
 

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

@@ -166 +166 @@
    void CGrid::checkAttributesAfterTransformation()
    {
-      int myRank;
-      MPI_Comm_rank(MPI_COMM_WORLD, &myRank);
-
-      setAxisList();  //printf("myRank = %d, setAxisList OK\n", myRank);
-      std::vector<CAxis*> axisListP = this->getAxis();  //printf("myRank = %d, this->getAxis OK\n", myRank);
+      
+      setAxisList();  
+      std::vector<CAxis*> axisListP = this->getAxis(); 
       if (!axisListP.empty())
       {
@@ -183 +181 @@
             axisPositionInGrid_.push_back(idx);
             ++idx;
-            //printf("myRank = %d, axisPositionInGrid_.push_back OK\n", myRank);
+            
           }
           else if (2 == elementDimension) idx += 2;
@@ -191 +189 @@
         {
           axisListP[i]->checkAttributesOnClientAfterTransformation(globalDim_,axisPositionInGrid_[i]);
-          //printf("myRank = %d, axisListP[%d/%d]->checkAttributesOnClientAfterTransformation OK\n", myRank, i, axisListP.size());
-        }
-      }
-
-      setDomainList(); //printf("myRank = %d, setDomainList OK\n", myRank);
-      std::vector<CDomain*> domListP = this->getDomains(); //printf("myRank = %d, this->getDomains OK\n", myRank);
+        }
+      }
+
+      setDomainList(); 
+      std::vector<CDomain*> domListP = this->getDomains();
       if (!domListP.empty())
       {
         for (int i = 0; i < domListP.size(); ++i)
         {
-          //printf("myRank = %d, start domListP[%d]->checkAttributesOnClientAfterTransformation\n", myRank, i);
           domListP[i]->checkAttributesOnClientAfterTransformation();
-          //printf("myRank = %d, domListP[%d]->checkAttributesOnClientAfterTransformation OK\n", myRank, i);
         }
       }