Changeset 1133


Ignore:
Timestamp:
05/16/17 10:28:58 (4 years ago)
Author:
oabramkina
Message:

Fixing a bug appearing during client/server initialization.

Location:
XIOS/dev/dev_olga
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_olga/bld.cfg

    r1130 r1133  
    3131bld::lib xios 
    3232bld::target libxios.a  
    33 #bld::target generate_fortran_interface.exe  
    34 #bld::target xios_server.exe #test_remap.exe 
     33bld::target test_remap.exe 
    3534bld::target xios_server.exe  
    3635bld::target test_regular.exe 
    3736bld::target test_xios2_cmip6.exe 
    3837#bld::target test_new_features.exe test_unstruct_complete.exe  
    39 #bld::target test_client.exe  
    4038bld::target test_complete.exe 
    4139bld::target test_client.exe 
  • XIOS/dev/dev_olga/src/server.cpp

    r1130 r1133  
    8585        map<unsigned long, int> colors ; 
    8686        map<unsigned long, int> leaders ; 
     87        map<unsigned long, int> lastProcesses ;  // needed in case of two server levels 
    8788        map<unsigned long, int>::iterator it ; 
    8889 
     
    9596            c++ ; 
    9697          } 
     98          if (hashAll[i+1] != hashAll[i]) 
     99            lastProcesses[hashAll[i]]=i ; 
    97100        } 
    98101 
     
    102105        { 
    103106          int serverRank = rank_ - leaders[hashServer]; // server proc rank starting 0 
    104           serverSize_ = size - leaders[hashServer]; 
     107          serverSize_ = lastProcesses[hashServer] - leaders[hashServer] + 1; 
     108//          serverSize_ = lastProcesses - leaders[hashServer]; 
    105109          nbPools = serverSize_ * CXios::ratioServer2 / 100; 
    106110          if ( serverRank < (serverSize_ - nbPools) ) 
Note: See TracChangeset for help on using the changeset viewer.