Changeset 1133 for XIOS/dev

Timestamp:

05/16/17 10:28:58 (7 years ago)

Author:

oabramkina

Message:

Fixing a bug appearing during client/server initialization.

Location:

XIOS/dev/dev_olga

Files:

• bld.cfg (modified) (1 diff)
• src/server.cpp (modified) (3 diffs)
• src/test/test_xios2_cmip6.f90 (added)

XIOS/dev/dev_olga/bld.cfg

@@ -31 +31 @@
 bld::lib xios
 bld::target libxios.a 
-#bld::target generate_fortran_interface.exe 
-#bld::target xios_server.exe #test_remap.exe
+bld::target test_remap.exe
 bld::target xios_server.exe 
 bld::target test_regular.exe
 bld::target test_xios2_cmip6.exe
 #bld::target test_new_features.exe test_unstruct_complete.exe 
-#bld::target test_client.exe 
 bld::target test_complete.exe
 bld::target test_client.exe

XIOS/dev/dev_olga/src/server.cpp

@@ -85 +85 @@
         map<unsigned long, int> colors ;
         map<unsigned long, int> leaders ;
+        map<unsigned long, int> lastProcesses ;  // needed in case of two server levels
         map<unsigned long, int>::iterator it ;
 
@@ -95 +96 @@
             c++ ;
           }
+          if (hashAll[i+1] != hashAll[i])
+            lastProcesses[hashAll[i]]=i ;
         }
 
@@ -102 +105 @@
         {
           int serverRank = rank_ - leaders[hashServer]; // server proc rank starting 0
-          serverSize_ = size - leaders[hashServer];
+          serverSize_ = lastProcesses[hashServer] - leaders[hashServer] + 1;
+//          serverSize_ = lastProcesses - leaders[hashServer];
           nbPools = serverSize_ * CXios::ratioServer2 / 100;
           if ( serverRank < (serverSize_ - nbPools) )