Per discussion in ticket #2009, temporarily disable the block CID allocation

algorithms until they properly reuse CIDs.

This commit was SVN r21879.

ompi/communicator/comm_cid.c

@@ -191,12 +191,18 @@ int ompi_comm_nextcid ( ompi_communicator_t* newcomm,
             break;
     }
 
-    /**
+    /*
+     * BWB: Always make the multi-threaded algorithm the selected
+     * algorithm.  The others don't reuse CIDs which leads to CID
+     * space exhaustion in real-world applications. Leave the other
+     * code, as Edgar plans on adding CID reuse in the not-to-distant
+     * future. */
+    /*
      * In case multi-threading is enabled by at least one process, or in 
      * case of dynamic communicators, we revert to the old algorithm
      * starting from cid_block_start
      */
-    if ( ompi_comm_world_thread_level_mult || OMPI_COMM_IS_DYNAMIC (newcomm) ) {
+    if (1 || ompi_comm_world_thread_level_mult || OMPI_COMM_IS_DYNAMIC (newcomm) ) {
         int nextlocal_cid;
         int done=0;
         int response, glresponse=0;