Changeset 956


Ignore:
Timestamp:
09/30/16 15:28:00 (5 years ago)
Author:
rlacroix
Message:

Make sure CXios::isClient and CXios::isServer variables are used in a sensible way.

Location:
XIOS/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/cxios.cpp

    r719 r956  
    7777    initialize() ; 
    7878 
    79     isClient=true; 
     79    isClient = true; 
    8080 
    8181    CClient::initialize(codeId,localComm,returnComm) ; 
    8282    if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ; 
    8383 
    84     if (usingServer) isServer=false; 
    85     else isServer=true; 
     84    // If there are no server processes then we are in attached mode 
     85    // and the clients are also servers 
     86    isServer = !usingServer; 
    8687 
    8788    if (printLogs2Files) 
     
    129130  { 
    130131    initServer(); 
    131     isClient=true; 
    132     isServer=false ; 
     132    isClient = false; 
     133    isServer = true; 
    133134 
    134135    // Initialize all aspects MPI 
  • XIOS/trunk/src/server.cpp

    r925 r956  
    185185         contextEventLoop() ; 
    186186         if (finished && contextList.empty()) stop=true ; 
    187          if (! CXios::isServer) eventScheduler->checkEvent() ; 
     187         eventScheduler->checkEvent() ; 
    188188       } 
    189189       CTimer::get("XIOS server").suspend() ; 
Note: See TracChangeset for help on using the changeset viewer.