Changeset 507 for XIOS/branchs/xios-1.0

Timestamp:

10/22/14 13:28:48 (9 years ago)

Author:

aclsce

Message:

Fixed problem encountered in the case "using_oasis=true" : automatic detection of a server does not work in coupled mode.
Back to the old method : if you want to use XIOS server mode, it is mandatory to specify "using_server=true" in iodef.xml in coupled case.

Location:

XIOS/branchs/xios-1.0/src

Files:

• client.cpp (modified) (1 diff)
• cxios.cpp (modified) (1 diff)

XIOS/branchs/xios-1.0/src/client.cpp

@@ -132 +132 @@
         CTimer::get("XIOS").resume() ;
         CTimer::get("XIOS init").resume() ;
-
-          // Verify whether we are on server mode or not
-        CXios::setNotUsingServer();
-        int interCommSize = 0, intraCommSize = 0;
-        oasis_get_intercomm(interComm,CXios::xiosCodeId);
-        MPI_Comm_size(interComm, &interCommSize);
-        MPI_Comm_size(intraComm, &intraCommSize);
-        if (interCommSize == intraCommSize) CXios::setUsingServer();
-
-        if (CXios::usingServer)
+  
+        if (CXios::usingServer) 
         {
           MPI_Status status ;
           MPI_Comm_rank(intraComm,&rank) ;
+
           oasis_get_intercomm(interComm,CXios::xiosCodeId) ;
           if (rank==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ;

XIOS/branchs/xios-1.0/src/cxios.cpp

@@ -36 +36 @@
     parseFile(rootFile);
     usingOasis=getin<bool>("using_oasis",false) ;
+    usingServer=getin<bool>("using_server",false) ;
     info.setLevel(getin<int>("info_level",0)) ;
     printInfo2File=getin<bool>("print_file",false);