Changeset 507


Ignore:
Timestamp:
10/22/14 13:28:48 (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/branchs/xios-1.0/src/client.cpp

    r501 r507  
    132132        CTimer::get("XIOS").resume() ; 
    133133        CTimer::get("XIOS init").resume() ; 
    134  
    135           // Verify whether we are on server mode or not 
    136         CXios::setNotUsingServer(); 
    137         int interCommSize = 0, intraCommSize = 0; 
    138         oasis_get_intercomm(interComm,CXios::xiosCodeId); 
    139         MPI_Comm_size(interComm, &interCommSize); 
    140         MPI_Comm_size(intraComm, &intraCommSize); 
    141         if (interCommSize == intraCommSize) CXios::setUsingServer(); 
    142  
    143         if (CXios::usingServer) 
     134   
     135        if (CXios::usingServer)  
    144136        { 
    145137          MPI_Status status ; 
    146138          MPI_Comm_rank(intraComm,&rank) ; 
     139 
    147140          oasis_get_intercomm(interComm,CXios::xiosCodeId) ; 
    148141          if (rank==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ; 
  • XIOS/branchs/xios-1.0/src/cxios.cpp

    r501 r507  
    3636    parseFile(rootFile); 
    3737    usingOasis=getin<bool>("using_oasis",false) ; 
     38    usingServer=getin<bool>("using_server",false) ; 
    3839    info.setLevel(getin<int>("info_level",0)) ; 
    3940    printInfo2File=getin<bool>("print_file",false); 
Note: See TracChangeset for help on using the changeset viewer.