Ignore:
Timestamp:
01/20/17 16:17:57 (7 years ago)
Author:
oabramkina
Message:

dev: intermediate commit.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/dev_olga/src/node/context.cpp

    r1027 r1030  
    520520   { 
    521521      // Use correct context client to send message 
    522      int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     522     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     523    int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    523524     for (int i = 0; i < nbSrvPools; ++i) 
    524525     { 
    … …  
    693694     { 
    694695       this->enabledFiles[i]->generateNewTransformationGridDest(); 
     696     } 
     697 
     698     for (int i = 0; i < size; ++i) 
     699     { 
     700       //this->enabledFiles[i]->checkGridOfEnabledFields(); 
    695701     } 
    696702   } 
    … …  
    898904   { 
    899905     // Use correct context client to send message 
    900      int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     906     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     907     int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    901908     for (int i = 0; i < nbSrvPools; ++i) 
    902909     { 
    … …  
    926933      *buffer>>id; 
    927934      get(id)->closeDefinition(); 
    928       // if (get(id)->hasClient && get(id)->hasServer) 
    929       // {         
    930       //   get(id)->sendCloseDefinition(); 
    931       // } 
    932935   } 
    933936 
    … …  
    937940     // Use correct context client to send message 
    938941//     CContextClient* contextClientTmp = (0 != clientPrimServer) ? clientPrimServer : client; 
    939      int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     942     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     943    int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    940944     for (int i = 0; i < nbSrvPools; ++i) 
    941945     { 
    … …  
    984988   { 
    985989     // Use correct context client to send message 
    986      int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     990     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     991     int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    987992     for (int i = 0; i < nbSrvPools; ++i) 
    988993     { 
    … …  
    10321037   { 
    10331038      // Use correct context client to send message 
    1034      int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     1039     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     1040     int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    10351041     for (int i = 0; i < nbSrvPools; ++i) 
    10361042     { 
    … …  
    10641070   { 
    10651071      // Use correct context client to send message 
    1066      int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     1072     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     1073     int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    10671074     for (int i = 0; i < nbSrvPools; ++i) 
    10681075     { 
    … …  
    15681575 
    15691576    // Use correct context client to send message 
    1570     int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     1577    // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1; 
     1578    int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1; 
    15711579    for (int i = 0; i < nbSrvPools; ++i) 
    15721580    { 
Note: See TracChangeset for help on using the changeset viewer.