Changeset 1037 for XIOS/dev/branch_yushan/src/client.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/client.cpp (modified) (10 diffs)

XIOS/dev/branch_yushan/src/client.cpp

@@ -30 +30 @@
       if (initialized) is_MPI_Initialized=true ;
       else is_MPI_Initialized=false ;
+      
+      //return;
 
 // don't use OASIS
@@ -87 +89 @@
 
           MPI_Comm_split(CXios::globalComm,myColor,rank,&intraComm) ;
+        
 
           if (CXios::usingServer)
@@ -97 +100 @@
             MPI_Comm_rank(intraComm,&intraCommRank) ;
             info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize
-                 <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< serverLeader<<endl ;
+                 <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader<<endl ;
             MPI_Intercomm_create(intraComm,0,CXios::globalComm,serverLeader,0,&interComm) ;
           }
@@ -148 +151 @@
 
       MPI_Comm_dup(intraComm,&returnComm) ;
+
     }
 
@@ -160 +164 @@
       if (!CXios::isServer)
       {
+      
+        
+        
         int size,rank,globalRank ;
         size_t message_size ;
@@ -165 +172 @@
         MPI_Comm contextInterComm ;
 
+        
         MPI_Comm_size(contextComm,&size) ;
         MPI_Comm_rank(contextComm,&rank) ;
@@ -173 +181 @@
         CMessage msg ;
         msg<<idServer<<size<<globalRank ;
-//        msg<<id<<size<<globalRank ;
+
 
         int messageSize=msg.size() ;
-        char * buff = new char[messageSize] ;
-        CBufferOut buffer((void*)buff,messageSize) ;
+        void * buff = new char[messageSize] ;
+        CBufferOut buffer(buff,messageSize) ;
         buffer<<msg ;
-
-        MPI_Send((void*)buff,buffer.count(),MPI_CHAR,serverLeader,1,CXios::globalComm) ;
+        
+        
+
+        MPI_Send(buff,buffer.count(),MPI_CHAR,serverLeader,1,CXios::globalComm) ;
         delete [] buff ;
+        
+        printf("====== Client: begin context_init \n");
+      
 
         MPI_Intercomm_create(contextComm,0,CXios::globalComm,serverLeader,10+globalRank,&contextInterComm) ;
         info(10)<<"Register new Context : "<<id<<endl ;
+        
+        cout<<"Register new Context : "<<id<<endl ;
+              
 
         MPI_Comm inter ;
         MPI_Intercomm_merge(contextInterComm,0,&inter) ;
         MPI_Barrier(inter) ;
-
+        
+        
         context->initClient(contextComm,contextInterComm) ;
+        
+        printf("====== Client: context_init OK\n");
 
         contextInterComms.push_back(contextInterComm);
@@ -220 +239 @@
 
       MPI_Comm_rank(intraComm,&rank) ;
+      
+      printf("CClient::finalize called isServer = %d\n", CXios::isServer);
  
       if (!CXios::isServer)
@@ -227 +248 @@
         {
           MPI_Send(&msg,1,MPI_INT,0,0,interComm) ;
+          printf(" CClient : send finalize sign to server 0\n");
         }
       }
@@ -241 +263 @@
       {
         if (CXios::usingOasis) oasis_finalize();
-        else MPI_Finalize() ;
+        else {MPI_Finalize() ; printf("CClient::finalize called MPI_finalize\n");}
       }