Changeset 1070 for XIOS/dev/branch_yushan/src/node/context.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/context.cpp (modified) (4 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();  
     }
    }