bluegene => bigsim
authorGengbin Zheng <gzheng@illinois.edu>
Tue, 11 Jul 2006 04:22:12 +0000 (04:22 +0000)
committerGengbin Zheng <gzheng@illinois.edu>
Tue, 11 Jul 2006 04:22:12 +0000 (04:22 +0000)
build
src/scripts/Make.depends
src/scripts/Makefile
src/scripts/charmc

diff --git a/build b/build
index 13a8e7e256d153d35f0745013b586b91df46b515..3d4f4d487fcc729852b5ca63522e6b28f7fd110c 100755 (executable)
--- a/build
+++ b/build
@@ -9,7 +9,7 @@ syntax() {
   echo ''
   echo 'Usage: build <target> <version> <options> [charmc-options ...]'
   echo ''
-  echo '<targets>: converse charm++ LIBS AMPI FEM bluegene pose jade msa'
+  echo '<targets>: converse charm++ LIBS AMPI FEM bigsim pose jade msa'
   echo '<targets>: doc ps-doc pdf-doc html-doc'
   if test $more = 1
   then
@@ -18,7 +18,7 @@ syntax() {
   echo '  AMPI            compile Adaptive MPI on top of Charm++'
   echo '  FEM             compile FEM framework'
   echo '  LIBS            compile additional parallel libraries with Charm++ core'
-  echo '  bluegene        build additional BigSim libraries'
+  echo '  bigsim          build additional BigSim libraries'
   echo '  pose            build POSE parallel discrete event simulator'
   echo '  jade            build Jade compiler (auto-builds charm++, msa)'
   echo '  msa             build Multiphase Shared Arrays(MSA) library'
@@ -29,7 +29,7 @@ syntax() {
   echo ''
   echo '<options>: compiler and platform specific options'
   echo 'cc cc64 cxx kcc pgcc acc icc ecc gcc3 mpcc pathscale'
-  echo 'help smp gm tcp vmi scyld clustermatic bluegene ooc syncft papi'
+  echo 'help smp gm tcp vmi scyld clustermatic bigsim ooc syncft papi'
   echo 'pthreads lam'
   echo '--incdir --libdir --basedir --no-build-shared -j'
   if test $more = 1
@@ -69,7 +69,7 @@ syntax() {
   echo '  pthreads        compile with pthreads Converse threads'
   echo ''
   echo 'Advanced options:'
-  echo '  bluegene       compile for BigSim (Blue Gene) simulator'
+  echo '  bigsim         compile for BigSim simulator'
   echo '  ooc            compile with out of core support'
   echo '  syncft         compile with Charm++ fault tolerance support'
   echo '  papi            compile with PAPI performance counter support (if any)'
index 860fde211fcdbbf3aa8934cf14fcec95b6a07eeb..a183dbe9da178b7ca907cc6f7e73f4bc2219bcc4 100644 (file)
@@ -2,96 +2,96 @@
 convcore.o: convcore.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h sockRoutines.h queueing.h conv-ccs.h \
-  ccs-server.h memory-isomalloc.h converseEvents.h traceCoreAPI.h \
-  converseProjections.h traceCoreCommon.h machineEvents.h \
+  persistent.h conv-onesided.h debug-conv.h sockRoutines.h queueing.h \
+  conv-ccs.h ccs-server.h memory-isomalloc.h converseEvents.h \
+  traceCoreAPI.h converseProjections.h traceCoreCommon.h machineEvents.h \
   machineProjections.h quiescence.h cmibacktrace.c
        $(CHARMC) -c -I. convcore.c
 
 conv-conds.o: conv-conds.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. conv-conds.c
 
 queueing.o: queueing.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h queueing.h
+  persistent.h conv-onesided.h debug-conv.h queueing.h
        $(CHARMC) -c -I. queueing.c
 
 msgmgr.o: msgmgr.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. msgmgr.c
 
 cpm.o: cpm.c queueing.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. cpm.c
 
 cpthreads.o: cpthreads.c cpthreads.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. cpthreads.c
 
 futures.o: futures.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. futures.c
 
 cldb.o: cldb.c queueing.h cldb.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. cldb.c
 
 topology.o: topology.C charm.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h cklists.h topology.h
+  persistent.h conv-onesided.h debug-conv.h pup.h cklists.h topology.h
        $(CHARMC) -c -I. topology.C
 
 random.o: random.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. random.c
 
 debug-conv.o: debug-conv.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h queueing.h conv-ccs.h sockRoutines.h \
-  ccs-server.h
+  persistent.h conv-onesided.h debug-conv.h queueing.h conv-ccs.h \
+  sockRoutines.h ccs-server.h
        $(CHARMC) -c -I. debug-conv.c
 
 generate.o: generate.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h typedefs.h
+  persistent.h conv-onesided.h debug-conv.h typedefs.h
        $(CHARMC) -c -I. generate.c
 
 edgelist.o: edgelist.c typedefs.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. edgelist.c
 
 conv-ccs.o: conv-ccs.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h conv-ccs.h sockRoutines.h ccs-server.h \
-  queueing.h ckhashtable.h pup.h converse.h
+  persistent.h conv-onesided.h debug-conv.h conv-ccs.h sockRoutines.h \
+  ccs-server.h queueing.h ckhashtable.h pup.h
        $(CHARMC) -c -I. conv-ccs.c
 
 ccs-builtins.o: ccs-builtins.C converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h ckhashtable.h pup.h converse.h \
+  persistent.h conv-onesided.h debug-conv.h ckhashtable.h pup.h \
   pup_toNetwork4.h debug-charm.h conv-ccs.h sockRoutines.h ccs-server.h \
   queueing.h
        $(CHARMC) -c -I. ccs-builtins.C
@@ -99,7 +99,7 @@ ccs-builtins.o: ccs-builtins.C converse.h conv-config.h conv-autoconfig.h \
 traceCore.o: traceCore.C converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h traceCore.h traceCoreCommon.h \
+  persistent.h conv-onesided.h debug-conv.h traceCore.h traceCoreCommon.h \
   converseEvents.h traceCoreAPI.h converseProjections.h charmEvents.h \
   charmProjections.h machineEvents.h machineProjections.h
        $(CHARMC) -c -I. traceCore.C
@@ -107,59 +107,59 @@ traceCore.o: traceCore.C converse.h conv-config.h conv-autoconfig.h \
 traceCoreCommon.o: traceCoreCommon.C traceCore.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h traceCoreAPI.h traceCoreCommon.h \
-  charmProjections.h
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h traceCoreAPI.h \
+  traceCoreCommon.h charmProjections.h
        $(CHARMC) -c -I. traceCoreCommon.C
 
 converseProjections.o: converseProjections.C converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h converseEvents.h traceCoreAPI.h \
-  converseProjections.h traceCoreCommon.h
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h converseEvents.h \
+  traceCoreAPI.h converseProjections.h traceCoreCommon.h
        $(CHARMC) -c -I. converseProjections.C
 
 machineProjections.o: machineProjections.C converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h machineEvents.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h machineEvents.h \
   machineProjections.h traceCoreAPI.h traceCoreCommon.h
        $(CHARMC) -c -I. machineProjections.C
 
 quiescence.o: quiescence.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h quiescence.h
+  persistent.h conv-onesided.h debug-conv.h quiescence.h
        $(CHARMC) -c -I. quiescence.c
 
 isomalloc.o: isomalloc.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h memory-isomalloc.h
+  persistent.h conv-onesided.h debug-conv.h memory-isomalloc.h
        $(CHARMC) -c -I. isomalloc.c
 
 conv-counter.o: conv-counter.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. conv-counter.c
 
 global-nop.o: global-nop.c converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. global-nop.c
 
 cmipool.o: cmipool.c cmipool.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. cmipool.c
 
 trace-projections.o: trace-projections.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -177,8 +177,8 @@ trace-projections.o: trace-projections.C charm++.h charm.h converse.h \
 trace-summary.o: trace-summary.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -197,8 +197,8 @@ trace-summary.o: trace-summary.C charm++.h charm.h converse.h \
 trace-counter.o: trace-counter.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -215,8 +215,8 @@ trace-counter.o: trace-counter.C charm++.h charm.h converse.h \
 trace-bluegene.o: trace-bluegene.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -235,8 +235,8 @@ trace-bluegene.o: trace-bluegene.C charm++.h charm.h converse.h \
 trace-projector.o: trace-projector.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -248,8 +248,8 @@ trace-projector.o: trace-projector.C charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h trace-projector.h ck.h \
-  qd.h register.h stats.h ckfutures.h allEvents.h charmEvents.h \
-  charmProjections.h traceCoreAPI.h converseEvents.h \
+  qd.h register.h stats.h ckfutures.h ckIgetControl.h allEvents.h \
+  charmEvents.h charmProjections.h traceCoreAPI.h converseEvents.h \
   converseProjections.h machineEvents.h machineProjections.h traceCore.h \
   threadEvents.h traceCoreCommon.h trace-common.h trace-projections.h
        $(CHARMC) -c -I. trace-projector.C
@@ -257,7 +257,7 @@ trace-projector.o: trace-projector.C charm++.h charm.h converse.h \
 trace-converse.o: trace-converse.c conv-trace.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  persistent.h debug-conv.h
+  persistent.h conv-onesided.h debug-conv.h
        $(CHARMC) -c -I. trace-converse.c
 
 trace-all.o: trace-all.C
@@ -266,8 +266,8 @@ trace-all.o: trace-all.C
 trace-recordreplay.o: trace-recordreplay.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -285,10 +285,10 @@ trace-recordreplay.o: trace-recordreplay.C charm++.h charm.h converse.h \
 trace-common.o: trace-common.C charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckliststring.h trace.h trace-bluegene.h trace-common.h \
-  allEvents.h charmEvents.h charmProjections.h traceCoreAPI.h \
-  converseEvents.h converseProjections.h machineEvents.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckliststring.h trace.h trace-bluegene.h \
+  trace-common.h allEvents.h charmEvents.h charmProjections.h \
+  traceCoreAPI.h converseEvents.h converseProjections.h machineEvents.h \
   machineProjections.h traceCore.h threadEvents.h traceCoreCommon.h \
   register.h
        $(CHARMC) -c -I. trace-common.C
@@ -296,15 +296,15 @@ trace-common.o: trace-common.C charm.h converse.h conv-config.h \
 tracef.o: tracef.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
@@ -314,8 +314,8 @@ tracef.o: tracef.C charm++.h charm.h converse.h conv-config.h \
 init.o: init.C ck.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -327,14 +327,14 @@ init.o: init.C ck.h charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h
+  ckfutures.h ckIgetControl.h
        $(CHARMC) -c -I. init.C
 
 register.o: register.C ck.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -346,14 +346,14 @@ register.o: register.C ck.h charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h
+  ckfutures.h ckIgetControl.h
        $(CHARMC) -c -I. register.C
 
 qd.o: qd.C ck.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -365,14 +365,14 @@ qd.o: qd.C ck.h charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h
+  ckfutures.h ckIgetControl.h
        $(CHARMC) -c -I. qd.C
 
 ck.o: ck.C ck.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -384,14 +384,14 @@ ck.o: ck.C ck.h charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h queueing.h CkMarshall.def.h
+  ckfutures.h ckIgetControl.h queueing.h CkMarshall.def.h
        $(CHARMC) -c -I. ck.C
 
 main.o: main.C ck.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -403,14 +403,14 @@ main.o: main.C ck.h charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h
+  ckfutures.h ckIgetControl.h
        $(CHARMC) -c -I. main.C
 
 msgalloc.o: msgalloc.C ck.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -422,14 +422,14 @@ msgalloc.o: msgalloc.C ck.h charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h queueing.h
+  ckfutures.h ckIgetControl.h queueing.h
        $(CHARMC) -c -I. msgalloc.C
 
-ckfutures.o: ckfutures.C ckIgetControl.h charm++.h charm.h converse.h conv-config.h \
+ckfutures.o: ckfutures.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -441,17 +441,32 @@ ckfutures.o: ckfutures.C ckIgetControl.h charm++.h charm.h converse.h conv-confi
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ck.h qd.h register.h \
-  stats.h ckfutures.h CkFutures.def.h
+  stats.h ckfutures.h ckIgetControl.h CkFutures.def.h
        $(CHARMC) -c -I. ckfutures.C
 
-ckIgetControl.o: ckIgetControl.h ckIgetControl.C converse.h
+ckIgetControl.o: ckIgetControl.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h ckIgetControl.h
        $(CHARMC) -c -I. ckIgetControl.C
 
 debug-message.o: debug-message.C ck.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -463,17 +478,17 @@ debug-message.o: debug-message.C ck.h charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h register.h stats.h \
-  ckfutures.h envelope.h queueing.h
+  ckfutures.h ckIgetControl.h queueing.h
        $(CHARMC) -c -I. debug-message.C
 
 debug-charm.o: debug-charm.C converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h ckhashtable.h pup.h converse.h conv-ccs.h \
-  sockRoutines.h ccs-server.h debug-charm.h charm.h middle.h \
+  persistent.h conv-onesided.h debug-conv.h ckhashtable.h pup.h \
+  conv-ccs.h sockRoutines.h ccs-server.h debug-charm.h charm.h middle.h \
   middle-conv.h cklists.h register.h ck.h charm++.h ckbitvector.h \
-  ckstream.h init.h charm.h CkMarshall.decl.h cksection.h ckcallback.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  ckstream.h init.h CkMarshall.decl.h cksection.h ckcallback.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
@@ -482,14 +497,14 @@ debug-charm.o: debug-charm.C converse.h conv-config.h conv-autoconfig.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h \
-  stats.h ckfutures.h
+  stats.h ckfutures.h ckIgetControl.h
        $(CHARMC) -c -I. debug-charm.C
 
 ckcallback.o: ckcallback.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -507,8 +522,8 @@ ckcallback.o: ckcallback.C charm++.h charm.h converse.h conv-config.h \
 cklocation.o: cklocation.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -520,14 +535,14 @@ cklocation.o: cklocation.C charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h register.h ck.h qd.h \
-  stats.h ckfutures.h CkLocation.def.h
+  stats.h ckfutures.h ckIgetControl.h CkLocation.def.h
        $(CHARMC) -c -I. cklocation.C
 
 ckarray.o: ckarray.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -539,14 +554,14 @@ ckarray.o: ckarray.C charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h register.h ck.h qd.h \
-  stats.h ckfutures.h CkArray.def.h
+  stats.h ckfutures.h ckIgetControl.h CkArray.def.h
        $(CHARMC) -c -I. ckarray.C
 
 ckreduction.o: ckreduction.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -558,14 +573,14 @@ ckreduction.o: ckreduction.C charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ck.h qd.h register.h \
-  stats.h ckfutures.h CkReduction.def.h
+  stats.h ckfutures.h ckIgetControl.h CkReduction.def.h
        $(CHARMC) -c -I. ckreduction.C
 
 ckarrayreductionmgr.o: ckarrayreductionmgr.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -577,14 +592,14 @@ ckarrayreductionmgr.o: ckarrayreductionmgr.C charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ck.h qd.h register.h \
-  stats.h ckfutures.h CkArrayReductionMgr.def.h
+  stats.h ckfutures.h ckIgetControl.h CkArrayReductionMgr.def.h
        $(CHARMC) -c -I. ckarrayreductionmgr.C
 
 tempo.o: tempo.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -601,8 +616,8 @@ tempo.o: tempo.C charm++.h charm.h converse.h conv-config.h \
 waitqd.o: waitqd.C waitqd.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -617,50 +632,48 @@ waitqd.o: waitqd.C waitqd.h charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. waitqd.C
 
 LBDatabase.o: LBDatabase.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h LBDatabase.h lbdb.h converse.h charm.h pup.h \
-  middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
-  init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h \
-  NullLB.decl.h BaseLB.decl.h LBDatabase.def.h LBSimulation.h charm++.h \
-  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h topology.h \
-  NullLB.h BaseLB.h
+  persistent.h conv-onesided.h debug-conv.h LBDatabase.h lbdb.h charm.h \
+  pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h \
+  LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
+  ComlibArrayListener.h ComlibStrategy.h convcomlibstrategy.h \
+  ComlibLearner.h envelope.h CkFutures.decl.h charisma.h charisma.decl.h \
+  tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h NullLB.decl.h BaseLB.decl.h LBDatabase.def.h \
+  LBSimulation.h CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
+  topology.h NullLB.h
        $(CHARMC) -c -I. LBDatabase.C
 
 lbdb.o: lbdb.C converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h lbdb.h converse.h charm.h pup.h middle.h middle-conv.h \
-  LBObj.h LBOM.h LBDatabase.h LBDBManager.h cklists.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
-  init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h \
+  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h lbdb.h charm.h pup.h middle.h middle-conv.h LBObj.h LBOM.h \
+  LBDatabase.h LBDBManager.h cklists.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
   NullLB.decl.h BaseLB.decl.h
        $(CHARMC) -c -I. lbdb.C
 
 lbdbf.o: lbdbf.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -677,8 +690,8 @@ lbdbf.o: lbdbf.C charm++.h charm.h converse.h conv-config.h \
 charisma.o: charisma.C charisma.h charisma.decl.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -695,8 +708,8 @@ charisma.o: charisma.C charisma.h charisma.decl.h charm++.h charm.h \
 ckobjQ.o: ckobjQ.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -713,29 +726,29 @@ ckobjQ.o: ckobjQ.C charm++.h charm.h converse.h conv-config.h \
 LBAgent.o: LBAgent.C LBAgent.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h charm.h pup.h \
-  middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
-  init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  ComlibArrayListener.h ComlibStrategy.h convcomlibstrategy.h \
-  ComlibLearner.h envelope.h CkFutures.decl.h charisma.h charisma.decl.h \
-  tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h \
-  CentralLBMsg.h topology.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h NullLB.decl.h \
+  BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h topology.h
        $(CHARMC) -c -I. LBAgent.C
 
 LBProfit.o: LBProfit.C converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h LBProfit.h BaseLB.h LBDatabase.h lbdb.h \
-  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
-  LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
+  persistent.h conv-onesided.h debug-conv.h LBProfit.h BaseLB.h \
+  LBDatabase.h lbdb.h charm.h pup.h middle.h middle-conv.h LBDBManager.h \
+  cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h \
+  charm++.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -751,8 +764,8 @@ LBProfit.o: LBProfit.C converse.h conv-config.h conv-autoconfig.h \
 ckcheckpoint.o: ckcheckpoint.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -764,14 +777,14 @@ ckcheckpoint.o: ckcheckpoint.C charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ck.h qd.h register.h \
-  stats.h ckfutures.h CkCheckpoint.def.h
+  stats.h ckfutures.h ckIgetControl.h CkCheckpoint.def.h
        $(CHARMC) -c -I. ckcheckpoint.C
 
 ckmemcheckpoint.o: ckmemcheckpoint.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -783,14 +796,14 @@ ckmemcheckpoint.o: ckmemcheckpoint.C charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ck.h qd.h register.h \
-  stats.h ckfutures.h CkMemCheckpoint.def.h
+  stats.h ckfutures.h ckIgetControl.h CkMemCheckpoint.def.h
        $(CHARMC) -c -I. ckmemcheckpoint.C
 
 ckevacuation.o: ckevacuation.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -802,96 +815,95 @@ ckevacuation.o: ckevacuation.C charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ck.h qd.h register.h \
-  stats.h ckfutures.h
+  stats.h ckfutures.h ckIgetControl.h
        $(CHARMC) -c -I. ckevacuation.C
 
 LBDBManager.o: LBDBManager.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h LBDBManager.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h
        $(CHARMC) -c -I. LBDBManager.C
 
 LBComm.o: LBComm.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h LBComm.h converse.h lbdb.h charm.h pup.h \
+  persistent.h conv-onesided.h debug-conv.h LBComm.h lbdb.h charm.h pup.h \
   middle.h middle-conv.h
        $(CHARMC) -c -I. LBComm.C
 
 LBObj.o: LBObj.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h LBObj.h LBOM.h \
-  LBDBManager.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h
        $(CHARMC) -c -I. LBObj.C
 
 LBMachineUtil.o: LBMachineUtil.C LBDatabase.h lbdb.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h charm.h pup.h \
-  middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
-  init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  ComlibArrayListener.h ComlibStrategy.h convcomlibstrategy.h \
-  ComlibLearner.h envelope.h CkFutures.decl.h charisma.h charisma.decl.h \
-  tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h NullLB.decl.h BaseLB.decl.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h NullLB.decl.h \
+  BaseLB.decl.h
        $(CHARMC) -c -I. LBMachineUtil.C
 
 CentralPredictor.o: CentralPredictor.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h charm++.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h CentralLB.h BaseLB.h \
+  CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. CentralPredictor.C
 
 BaseLB.o: BaseLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -903,35 +915,33 @@ BaseLB.o: BaseLB.C charm++.h charm.h converse.h conv-config.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h BaseLB.h LBSimulation.h \
-  charm++.h CentralLB.h CentralLB.decl.h CentralLBMsg.h BaseLB.def.h
+  CentralLB.h CentralLB.decl.h CentralLBMsg.h BaseLB.def.h
        $(CHARMC) -c -I. BaseLB.C
 
 CentralLB.o: CentralLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h envelope.h CentralLB.h \
-  BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h \
-  LBDatabase.decl.h CentralLBMsg.h LBDBManager.h LBSimulation.h \
-  ComlibStrategy.h CentralLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h CentralLB.h BaseLB.h \
+  CentralLB.decl.h CentralLBMsg.h LBSimulation.h CentralLB.def.h
        $(CHARMC) -c -I. CentralLB.C
 
 HybridBaseLB.o: HybridBaseLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -953,8 +963,8 @@ HybridBaseLB.o: HybridBaseLB.C charm++.h charm.h converse.h conv-config.h \
 NborBaseLB.o: NborBaseLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -972,8 +982,8 @@ NborBaseLB.o: NborBaseLB.C charm++.h charm.h converse.h conv-config.h \
 WSLB.o: WSLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -984,18 +994,17 @@ WSLB.o: WSLB.C charm++.h charm.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h BaseLB.h LBDatabase.h \
-  cklists.h heap.h elements.h Set.h WSLB.h BaseLB.h WSLB.decl.h \
-  topology.h WSLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h BaseLB.h heap.h \
+  elements.h Set.h WSLB.h WSLB.decl.h topology.h WSLB.def.h
        $(CHARMC) -c -I. WSLB.C
 
 ObjGraph.o: ObjGraph.C ObjGraph.h lbdb.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h charm.h pup.h middle.h \
-  middle-conv.h CentralLB.h BaseLB.h LBDatabase.h LBDBManager.h cklists.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h charm.h pup.h \
+  middle.h middle-conv.h CentralLB.h BaseLB.h LBDatabase.h LBDBManager.h \
+  cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h \
+  charm++.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1010,17 +1019,17 @@ ObjGraph.o: ObjGraph.C ObjGraph.h lbdb.h converse.h conv-config.h \
 
 graph.o: graph.c converse.h conv-config.h conv-autoconfig.h conv-common.h \
   conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
-  graph.h
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h graph.h
        $(CHARMC) -c -I. graph.c
 
 LButil.o: LButil.C elements.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h middle-conv.h \
-  Set.h cklists.h heap.h BaseLB.h LBDatabase.h LBDBManager.h LBObj.h \
-  LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
+  persistent.h conv-onesided.h debug-conv.h lbdb.h charm.h pup.h middle.h \
+  middle-conv.h Set.h cklists.h heap.h BaseLB.h LBDatabase.h \
+  LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h \
+  charm++.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1036,12 +1045,32 @@ LButil.o: LButil.C elements.h converse.h conv-config.h conv-autoconfig.h \
 Refiner.o: Refiner.C Refiner.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h charm.h pup.h \
-  middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h NullLB.decl.h \
+  BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h elements.h Set.h heap.h
+       $(CHARMC) -c -I. Refiner.C
+
+RefinerApprox.o: RefinerApprox.C RefinerApprox.h CentralLB.h BaseLB.h \
+  LBDatabase.h lbdb.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h conv-onesided.h debug-conv.h charm.h pup.h middle.h \
+  middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
   LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
-  init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  init.h ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
   ComlibArrayListener.h ComlibStrategy.h convcomlibstrategy.h \
@@ -1049,47 +1078,27 @@ Refiner.o: Refiner.C Refiner.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
   trace-bluegene.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h \
-  CentralLBMsg.h elements.h Set.h heap.h
-       $(CHARMC) -c -I. Refiner.C
-
-RefinerApprox.o: RefinerApprox.C RefinerApprox.h CentralLB.h BaseLB.h \
-  LBDatabase.h lbdb.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
-  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h Refiner.h \
-  elements.h Set.h heap.h
+  CentralLBMsg.h Refiner.h elements.h Set.h heap.h
        $(CHARMC) -c -I. RefinerApprox.C
 
 RefinerComm.o: RefinerComm.C RefinerComm.h CentralLB.h BaseLB.h \
   LBDatabase.h lbdb.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
-  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h elements.h \
-  Set.h heap.h Refiner.h
+  persistent.h conv-onesided.h debug-conv.h charm.h pup.h middle.h \
+  middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
+  init.h ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
+  ComlibArrayListener.h ComlibStrategy.h convcomlibstrategy.h \
+  ComlibLearner.h envelope.h CkFutures.decl.h charisma.h charisma.decl.h \
+  tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h \
+  CentralLBMsg.h elements.h Set.h heap.h Refiner.h
        $(CHARMC) -c -I. RefinerComm.C
 
 bitvecset.o: bitvecset.c bitvecset.h
@@ -1098,22 +1107,22 @@ bitvecset.o: bitvecset.c bitvecset.h
 Set.o: Set.C Set.h elements.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h middle-conv.h \
-  cklists.h
+  persistent.h conv-onesided.h debug-conv.h lbdb.h charm.h pup.h middle.h \
+  middle-conv.h cklists.h
        $(CHARMC) -c -I. Set.C
 
 heap.o: heap.C heap.h elements.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h \
-  middle-conv.h Set.h cklists.h
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h lbdb.h charm.h \
+  pup.h middle.h middle-conv.h Set.h cklists.h
        $(CHARMC) -c -I. heap.C
 
 CommLBHeap.o: CommLBHeap.C CommLBHeap.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -1130,48 +1139,46 @@ CommLBHeap.o: CommLBHeap.C CommLBHeap.h charm++.h charm.h converse.h \
 NullLB.o: NullLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h BaseLB.h NullLB.h \
-  NullLB.decl.h ck.h charm++.h envelope.h qd.h register.h stats.h \
-  ckfutures.h CkFutures.decl.h charisma.h NullLB.def.h
-       $(CHARMC) -c -I. NullLB.C
-
-LBSimulation.o: LBSimulation.C LBSimulation.h charm++.h charm.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h BaseLB.h NullLB.h ck.h \
+  qd.h register.h stats.h ckfutures.h ckIgetControl.h NullLB.def.h
+       $(CHARMC) -c -I. NullLB.C
+
+LBSimulation.o: LBSimulation.C LBSimulation.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h charm++.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h CentralLB.h BaseLB.h \
+  CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. LBSimulation.C
 
 ComlibStrategy.o: ComlibStrategy.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -1188,8 +1195,8 @@ ComlibStrategy.o: ComlibStrategy.C charm++.h charm.h converse.h \
 ComlibArrayListener.o: ComlibArrayListener.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -1206,12 +1213,12 @@ ComlibArrayListener.o: ComlibArrayListener.C charm++.h charm.h converse.h \
 charmProjections.o: charmProjections.C converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h charmProjections.h \
-  traceCoreCommon.h charmEvents.h traceCoreAPI.h ck.h charm++.h charm.h \
-  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
-  charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  charmProjections.h traceCoreCommon.h charmEvents.h traceCoreAPI.h ck.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
@@ -1220,14 +1227,14 @@ charmProjections.o: charmProjections.C converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h qd.h \
-  register.h stats.h ckfutures.h trace-common.h
+  register.h stats.h ckfutures.h ckIgetControl.h trace-common.h
        $(CHARMC) -c -I. charmProjections.C
 
-charmf.o: charmf.C charm++.h charm.h converse.h conv-config.h \
+EveryLB.o: EveryLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1238,169 +1245,144 @@ charmf.o: charmf.C charm++.h charm.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h charmf.h charm-api.h
-       $(CHARMC) -c -I. charmf.C
-
-EveryLB.o: EveryLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h LBDatabase.h \
-  EveryLB.decl.h charm++.h DummyLB.decl.h CentralLB.decl.h BaseLB.decl.h \
-  LBDatabase.decl.h CentralLBMsg.h ComboCentLB.decl.h RandCentLB.decl.h \
-  RefineLB.decl.h RefineKLB.decl.h RefineCommLB.decl.h GreedyLB.decl.h \
-  GreedyCommLB.decl.h GreedyAgentLB.decl.h GridCommLB.decl.h \
-  GridCommRefineLB.decl.h GridMetisLB.decl.h Comm1LB.decl.h OrbLB.decl.h \
-  RecBisectBfLB.decl.h MetisLB.decl.h PhasebyArrayLB.decl.h RotateLB.decl.h \
-  NeighborLB.decl.h NborBaseLB.decl.h NeighborLBMsg.h NeighborCommLB.decl.h \
-  WSLB.decl.h TopoLB.decl.h RefineTopoLB.decl.h TopoCentLB.decl.h \
-  HybridLB.decl.h HybridBaseLB.decl.h HybridLBMsg.h HbmLB.decl.h \
-  BlockLB.decl.h EveryLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h EveryLB.decl.h \
+  DummyLB.decl.h CentralLB.decl.h CentralLBMsg.h ComboCentLB.decl.h \
+  RandCentLB.decl.h RefineLB.decl.h RefineKLB.decl.h RefineCommLB.decl.h \
+  GreedyLB.decl.h GreedyCommLB.decl.h GreedyAgentLB.decl.h \
+  GridCommLB.decl.h GridCommRefineLB.decl.h GridMetisLB.decl.h \
+  Comm1LB.decl.h OrbLB.decl.h RecBisectBfLB.decl.h MetisLB.decl.h \
+  PhasebyArrayLB.decl.h RotateLB.decl.h NeighborLB.decl.h \
+  NborBaseLB.decl.h NeighborLBMsg.h NeighborCommLB.decl.h WSLB.decl.h \
+  TopoLB.decl.h RefineTopoLB.decl.h TopoCentLB.decl.h HybridLB.decl.h \
+  HybridBaseLB.decl.h HybridLBMsg.h HbmLB.decl.h BlockLB.decl.h \
+  EveryLB.def.h
        $(CHARMC) -c -I. EveryLB.C
 
 DummyLB.o: DummyLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h DummyLB.h CentralLB.h \
-  BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h \
-  LBDatabase.decl.h CentralLBMsg.h DummyLB.decl.h DummyLB.def.h
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h DummyLB.decl.h DummyLB.def.h
        $(CHARMC) -c -I. DummyLB.C
 
 ComboCentLB.o: ComboCentLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ComboCentLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h ComboCentLB.decl.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h ComboCentLB.decl.h \
   ComboCentLB.def.h
        $(CHARMC) -c -I. ComboCentLB.C
 
 RandCentLB.o: RandCentLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h RandCentLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h RandCentLB.decl.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h RandCentLB.h CentralLB.h \
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h RandCentLB.decl.h \
   RandCentLB.def.h
        $(CHARMC) -c -I. RandCentLB.C
 
 RefineLB.o: RefineLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h RefineLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h Refiner.h elements.h \
-  converse.h lbdb.h Set.h heap.h RefineLB.decl.h RefineLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h RefineLB.h CentralLB.h \
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h Refiner.h elements.h Set.h \
+  heap.h RefineLB.decl.h RefineLB.def.h
        $(CHARMC) -c -I. RefineLB.C
 
 RefineKLB.o: RefineKLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h RefineKLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h RefinerApprox.h \
-  Refiner.h elements.h converse.h lbdb.h Set.h heap.h RefineKLB.decl.h \
-  RefineKLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h RefineKLB.h CentralLB.h \
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h RefinerApprox.h Refiner.h \
+  elements.h Set.h heap.h RefineKLB.decl.h RefineKLB.def.h
        $(CHARMC) -c -I. RefineKLB.C
 
 RefineCommLB.o: RefineCommLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h RefineCommLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h RefinerComm.h elements.h \
-  converse.h lbdb.h Set.h heap.h Refiner.h RefineLB.h RefineLB.decl.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h RefineCommLB.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h RefinerComm.h \
+  elements.h Set.h heap.h Refiner.h RefineLB.h RefineLB.decl.h \
   RefineCommLB.decl.h RefineCommLB.def.h
        $(CHARMC) -c -I. RefineCommLB.C
 
 GreedyLB.o: GreedyLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1418,51 +1400,49 @@ GreedyLB.o: GreedyLB.C charm++.h charm.h converse.h conv-config.h \
 GreedyCommLB.o: GreedyCommLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h GreedyCommLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h GreedyCommLB.decl.h \
-  elements.h converse.h lbdb.h Set.h heap.h CommLBHeap.h manager.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h GreedyCommLB.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
+  GreedyCommLB.decl.h elements.h Set.h heap.h CommLBHeap.h manager.h \
   GreedyCommLB.def.h
        $(CHARMC) -c -I. GreedyCommLB.C
 
 GreedyAgentLB.o: GreedyAgentLB.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h charm++.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  LBSimulation.h CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
-  cklists.h GreedyAgentLB.h CentralLB.h GreedyAgentLB.decl.h charm++.h \
-  CentralLB.decl.h LBAgent.h topology.h GreedyAgentLB.def.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h LBSimulation.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h GreedyAgentLB.h \
+  GreedyAgentLB.decl.h LBAgent.h topology.h GreedyAgentLB.def.h
        $(CHARMC) -c -I. GreedyAgentLB.C
 
 GridCommLB.o: GridCommLB.C GridCommLB.decl.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -1481,29 +1461,29 @@ GridCommLB.o: GridCommLB.C GridCommLB.decl.h charm++.h charm.h converse.h \
 GridCommRefineLB.o: GridCommRefineLB.C GridCommRefineLB.decl.h charm++.h \
   charm.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
   conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
-  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h CentralLB.decl.h \
-  CentralLBMsg.h GridCommRefineLB.h CentralLB.h BaseLB.h manager.h \
-  GridCommRefineLB.def.h
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  CentralLB.decl.h CentralLBMsg.h GridCommRefineLB.h CentralLB.h BaseLB.h \
+  manager.h GridCommRefineLB.def.h
        $(CHARMC) -c -I. GridCommRefineLB.C
 
-GridMetisLB.o: GridMetisLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
+GridMetisLB.o: GridMetisLB.C GridMetisLB.decl.h charm++.h charm.h \
+  converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
   ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
@@ -1513,40 +1493,57 @@ GridMetisLB.o: GridMetisLB.C charm++.h charm.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h GridMetisLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h GridMetisLB.decl.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h CentralLB.decl.h \
+  CentralLBMsg.h GridMetisLB.h CentralLB.h BaseLB.h manager.h \
   GridMetisLB.def.h
        $(CHARMC) -c -I. GridMetisLB.C
 
 Comm1LB.o: Comm1LB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h Comm1LB.h \
-  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h Comm1LB.decl.h \
-  charm++.h CentralLB.decl.h CommLBHeap.h GreedyCommLB.h CentralLB.h \
-  GreedyCommLB.decl.h elements.h converse.h lbdb.h Set.h heap.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h Comm1LB.h CentralLB.h \
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h Comm1LB.decl.h CommLBHeap.h \
+  GreedyCommLB.h GreedyCommLB.decl.h elements.h Set.h heap.h \
   Comm1LB.def.h
        $(CHARMC) -c -I. Comm1LB.C
 
 OrbLB.o: OrbLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h OrbLB.h CentralLB.h \
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h OrbLB.decl.h OrbLB.def.h
+       $(CHARMC) -c -I. OrbLB.C
+
+RecBisectBfLB.o: RecBisectBfLB.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
   ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
@@ -1556,39 +1553,36 @@ OrbLB.o: OrbLB.C charm++.h charm.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h OrbLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h OrbLB.decl.h OrbLB.def.h
-       $(CHARMC) -c -I. OrbLB.C
-
-RecBisectBfLB.o: RecBisectBfLB.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h charm++.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  RecBisectBfLB.h CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h \
-  charm++.h BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h \
-  RecBisectBfLB.decl.h ObjGraph.h lbdb.h graph.h bitvecset.h cklists.h \
-  RecBisectBfLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h RecBisectBfLB.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
+  RecBisectBfLB.decl.h ObjGraph.h graph.h bitvecset.h RecBisectBfLB.def.h
        $(CHARMC) -c -I. RecBisectBfLB.C
 
 MetisLB.o: MetisLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h MetisLB.h CentralLB.h \
+  BaseLB.h CentralLB.decl.h CentralLBMsg.h MetisLB.decl.h MetisLB.def.h
+       $(CHARMC) -c -I. MetisLB.C
+
+PhasebyArrayLB.o: PhasebyArrayLB.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
   ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
@@ -1598,38 +1592,16 @@ MetisLB.o: MetisLB.C charm++.h charm.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h MetisLB.h \
-  CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
-  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h MetisLB.decl.h \
-  MetisLB.def.h
-       $(CHARMC) -c -I. MetisLB.C
-
-PhasebyArrayLB.o: PhasebyArrayLB.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h charm++.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  PhasebyArrayLB.h CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h \
-  charm++.h BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h PhasebyArrayLB.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
   PhasebyArrayLB.decl.h PhasebyArrayLB.def.h
        $(CHARMC) -c -I. PhasebyArrayLB.C
 
 RotateLB.o: RotateLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1648,52 +1620,48 @@ RotateLB.o: RotateLB.C charm++.h charm.h converse.h conv-config.h \
 NeighborLB.o: NeighborLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h heap.h \
-  elements.h converse.h lbdb.h Set.h NeighborLB.h NborBaseLB.h BaseLB.h \
-  LBDatabase.h NborBaseLB.decl.h charm++.h LBDatabase.decl.h \
-  BaseLB.decl.h NeighborLBMsg.h topology.h NeighborLB.decl.h \
-  NeighborLB.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h heap.h elements.h Set.h \
+  NeighborLB.h NborBaseLB.h BaseLB.h NborBaseLB.decl.h NeighborLBMsg.h \
+  topology.h NeighborLB.decl.h NeighborLB.def.h
        $(CHARMC) -c -I. NeighborLB.C
 
 NeighborCommLB.o: NeighborCommLB.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h charm++.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h cklists.h \
-  heap.h elements.h converse.h lbdb.h Set.h NeighborCommLB.h NborBaseLB.h \
-  BaseLB.h LBDatabase.h NborBaseLB.decl.h charm++.h LBDatabase.decl.h \
-  BaseLB.decl.h NeighborLBMsg.h topology.h NeighborCommLB.decl.h \
-  NeighborCommLB.def.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h heap.h elements.h Set.h \
+  NeighborCommLB.h NborBaseLB.h BaseLB.h NborBaseLB.decl.h \
+  NeighborLBMsg.h topology.h NeighborCommLB.decl.h NeighborCommLB.def.h
        $(CHARMC) -c -I. NeighborCommLB.C
 
 TopoLB.o: TopoLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1712,8 +1680,8 @@ TopoLB.o: TopoLB.C charm++.h charm.h converse.h conv-config.h \
 RefineTopoLB.o: RefineTopoLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1732,8 +1700,8 @@ RefineTopoLB.o: RefineTopoLB.C charm++.h charm.h converse.h conv-config.h \
 TopoCentLB.o: TopoCentLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1752,8 +1720,8 @@ TopoCentLB.o: TopoCentLB.C charm++.h charm.h converse.h conv-config.h \
 HybridLB.o: HybridLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1776,8 +1744,8 @@ HybridLB.o: HybridLB.C charm++.h charm.h converse.h conv-config.h \
 HbmLB.o: HbmLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1799,8 +1767,8 @@ HbmLB.o: HbmLB.C charm++.h charm.h converse.h conv-config.h \
 BlockLB.o: BlockLB.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1819,91 +1787,91 @@ BlockLB.o: BlockLB.C charm++.h charm.h converse.h conv-config.h \
 manager.o: manager.C manager.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h charm.h pup.h \
-  middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h \
-  init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  ComlibArrayListener.h ComlibStrategy.h convcomlibstrategy.h \
-  ComlibLearner.h envelope.h CkFutures.decl.h charisma.h charisma.decl.h \
-  tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h \
-  CentralLBMsg.h
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
+  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
+  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h NullLB.decl.h \
+  BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. manager.C
 
 blue.o: blue.C cklists.h pup.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h queueing.h blue.h converse.h blue-conv.h \
-  blue_impl.h conv-mach.h ckliststring.h blue_types.h blue_timing.h \
-  bigsim_logs.h blue_defs.h blue_network.h
+  persistent.h conv-onesided.h debug-conv.h queueing.h blue.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h bigsim_logs.h \
+  blue_defs.h blue_network.h
        $(CHARMC) -c -I. blue.C
 
 blue_node.o: blue_node.C blue.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
-  ckliststring.h blue_types.h blue_timing.h cklists.h pup.h converse.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
   bigsim_logs.h blue_defs.h blue_network.h
        $(CHARMC) -c -I. blue_node.C
 
 blue_proc.o: blue_proc.C blue.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
-  ckliststring.h blue_types.h blue_timing.h cklists.h pup.h converse.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
   bigsim_logs.h blue_defs.h blue_network.h
        $(CHARMC) -c -I. blue_proc.C
 
 blue_init.o: blue_init.C queueing.h blue.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
-  ckliststring.h blue_types.h blue_timing.h cklists.h pup.h converse.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
   bigsim_logs.h blue_defs.h blue_network.h
        $(CHARMC) -c -I. blue_init.C
 
 blue_timing.o: blue_timing.C blue.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
-  ckliststring.h blue_types.h blue_timing.h cklists.h pup.h converse.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
   bigsim_logs.h blue_defs.h blue_network.h
        $(CHARMC) -c -I. blue_timing.C
 
-blue_IO.o: blue_IO.C blue.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h blue-conv.h blue_impl.h ckliststring.h \
-  blue_types.h blue_timing.h cklists.h pup.h converse.h bigsim_logs.h \
-  blue_defs.h blue_network.h
-       $(CHARMC) -c -I. blue_IO.C
+bigsim_IO.o: bigsim_IO.C blue.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h blue_network.h
+       $(CHARMC) -c -I. bigsim_IO.C
 
-blue_logs.o: blue_logs.C blue.h converse.h conv-config.h \
+bigsim_logs.o: bigsim_logs.C blue.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
-  ckliststring.h blue_types.h blue_timing.h cklists.h pup.h converse.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
   bigsim_logs.h blue_defs.h blue_network.h
-       $(CHARMC) -c -I. blue_logs.C
+       $(CHARMC) -c -I. bigsim_logs.C
 
-blue_api.o: blue_api.C blue.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h blue-conv.h blue_impl.h ckliststring.h \
-  blue_types.h blue_timing.h cklists.h pup.h converse.h bigsim_logs.h \
-  blue_defs.h blue_network.h
-       $(CHARMC) -c -I. blue_api.C
+bigsim_api.o: bigsim_api.C blue.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h blue_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h blue_network.h
+       $(CHARMC) -c -I. bigsim_api.C
 
 blue_stub.o: blue_stub.C charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1922,16 +1890,16 @@ blue_standalone.o: blue_standalone.C
 
 convcomlibstrategy.o: convcomlibstrategy.C converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibstrategy.h converse.h \
-  pup.h cklists.h
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  convcomlibstrategy.h pup.h cklists.h
        $(CHARMC) -c -I. convcomlibstrategy.C
 
 ComlibManager.o: ComlibManager.C ComlibManager.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -1942,26 +1910,26 @@ ComlibManager.o: ComlibManager.C ComlibManager.h charm++.h charm.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h EachToManyMulticastStrategy.h routerstrategy.h \
-  gridrouter.h petable.h graphrouter.h de.h treerouter.h 3dgridrouter.h \
-  prefixrouter.h DirectMulticastStrategy.h ComlibSectionInfo.h \
-  StreamingStrategy.h DummyStrategy.h MPIStrategy.h NodeMulticast.h \
-  MsgPacker.h register.h pup_cmialloc.h RingMulticastStrategy.h \
-  MultiRingMulticast.h PipeBroadcastStrategy.h pipebroadcastconverse.h \
-  BroadcastStrategy.h MeshStreamingStrategy.h PrioStreaming.h qd.h \
-  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h comlib.def.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h \
+  EachToManyMulticastStrategy.h routerstrategy.h gridrouter.h petable.h \
+  graphrouter.h de.h treerouter.h 3dgridrouter.h prefixrouter.h \
+  DirectMulticastStrategy.h ComlibSectionInfo.h StreamingStrategy.h \
+  DummyStrategy.h MPIStrategy.h NodeMulticast.h MsgPacker.h register.h \
+  pup_cmialloc.h RingMulticastStrategy.h MultiRingMulticast.h \
+  PipeBroadcastStrategy.h pipebroadcastconverse.h BroadcastStrategy.h \
+  MeshStreamingStrategy.h PrioStreaming.h qd.h CentralLB.h BaseLB.h \
+  CentralLB.decl.h CentralLBMsg.h comlib.def.h
        $(CHARMC) -c -I. ComlibManager.C
 
 MPIStrategy.o: MPIStrategy.C MPIStrategy.h ComlibManager.h charm++.h \
   charm.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
   conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
-  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
-  charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
@@ -1970,16 +1938,15 @@ MPIStrategy.o: MPIStrategy.C MPIStrategy.h ComlibManager.h charm++.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  convcomlib.h converse.h router.h convcomlibmanager.h \
-  convcomlibstrategy.h ComlibStats.h comlib.decl.h
+  convcomlib.h router.h convcomlibmanager.h ComlibStats.h comlib.decl.h
        $(CHARMC) -c -I. MPIStrategy.C
 
 StreamingStrategy.o: StreamingStrategy.C StreamingStrategy.h \
   ComlibManager.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -1990,17 +1957,17 @@ StreamingStrategy.o: StreamingStrategy.C StreamingStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h MsgPacker.h register.h pup_cmialloc.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h MsgPacker.h register.h \
+  pup_cmialloc.h
        $(CHARMC) -c -I. StreamingStrategy.C
 
 DummyStrategy.o: DummyStrategy.C DummyStrategy.h ComlibManager.h \
   charm++.h charm.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
+  persistent.h conv-onesided.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -2011,17 +1978,16 @@ DummyStrategy.o: DummyStrategy.C DummyStrategy.h ComlibManager.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h
        $(CHARMC) -c -I. DummyStrategy.C
 
 NodeMulticast.o: NodeMulticast.C NodeMulticast.h ComlibManager.h \
   charm++.h charm.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
+  persistent.h conv-onesided.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -2032,17 +1998,16 @@ NodeMulticast.o: NodeMulticast.C NodeMulticast.h ComlibManager.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h
        $(CHARMC) -c -I. NodeMulticast.C
 
 EachToManyMulticastStrategy.o: EachToManyMulticastStrategy.C \
   EachToManyMulticastStrategy.h ComlibManager.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2053,18 +2018,17 @@ EachToManyMulticastStrategy.o: EachToManyMulticastStrategy.C \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h routerstrategy.h gridrouter.h petable.h graphrouter.h \
-  de.h treerouter.h 3dgridrouter.h prefixrouter.h AAPLearner.h \
-  AAMLearner.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h routerstrategy.h \
+  gridrouter.h petable.h graphrouter.h de.h treerouter.h 3dgridrouter.h \
+  prefixrouter.h AAPLearner.h AAMLearner.h
        $(CHARMC) -c -I. EachToManyMulticastStrategy.C
 
 ComlibSectionInfo.o: ComlibSectionInfo.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2076,38 +2040,36 @@ ComlibSectionInfo.o: ComlibSectionInfo.C charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ComlibManager.h \
-  convcomlib.h converse.h router.h convcomlibmanager.h \
-  convcomlibstrategy.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
+  convcomlib.h router.h convcomlibmanager.h ComlibStats.h comlib.decl.h \
+  ComlibSectionInfo.h
        $(CHARMC) -c -I. ComlibSectionInfo.C
 
 AAPLearner.o: AAPLearner.C AAPLearner.h convcomlib.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
-  charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
-  ComlibManager.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h EachToManyMulticastStrategy.h routerstrategy.h \
-  gridrouter.h petable.h persistent.h graphrouter.h de.h treerouter.h \
-  3dgridrouter.h prefixrouter.h
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
+  ComlibManager.h convcomlibmanager.h ComlibStats.h comlib.decl.h \
+  EachToManyMulticastStrategy.h routerstrategy.h gridrouter.h petable.h \
+  graphrouter.h de.h treerouter.h 3dgridrouter.h prefixrouter.h
        $(CHARMC) -c -I. AAPLearner.C
 
 ComlibStats.o: ComlibStats.C ComlibStats.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2119,15 +2081,14 @@ ComlibStats.o: ComlibStats.C ComlibStats.h charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlibmanager.h \
-  converse.h convcomlib.h router.h convcomlibstrategy.h ComlibManager.h \
-  comlib.decl.h
+  convcomlib.h router.h ComlibManager.h comlib.decl.h
        $(CHARMC) -c -I. ComlibStats.C
 
 AAMLearner.o: AAMLearner.C AAMLearner.h ComlibManager.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2138,18 +2099,17 @@ AAMLearner.o: AAMLearner.C AAMLearner.h ComlibManager.h charm++.h charm.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h AAPLearner.h EachToManyMulticastStrategy.h \
-  routerstrategy.h gridrouter.h petable.h graphrouter.h de.h treerouter.h \
-  3dgridrouter.h prefixrouter.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h AAPLearner.h \
+  EachToManyMulticastStrategy.h routerstrategy.h gridrouter.h petable.h \
+  graphrouter.h de.h treerouter.h 3dgridrouter.h prefixrouter.h
        $(CHARMC) -c -I. AAMLearner.C
 
 MsgPacker.o: MsgPacker.C MsgPacker.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2161,17 +2121,16 @@ MsgPacker.o: MsgPacker.C MsgPacker.h charm++.h charm.h converse.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
   ckarrayreductionmgr.h trace.h trace-bluegene.h ComlibManager.h \
-  convcomlib.h converse.h router.h convcomlibmanager.h \
-  convcomlibstrategy.h ComlibStats.h comlib.decl.h register.h \
-  pup_cmialloc.h
+  convcomlib.h router.h convcomlibmanager.h ComlibStats.h comlib.decl.h \
+  register.h pup_cmialloc.h
        $(CHARMC) -c -I. MsgPacker.C
 
 DirectMulticastStrategy.o: DirectMulticastStrategy.C \
   DirectMulticastStrategy.h ComlibManager.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2182,17 +2141,16 @@ DirectMulticastStrategy.o: DirectMulticastStrategy.C \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h ComlibSectionInfo.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
        $(CHARMC) -c -I. DirectMulticastStrategy.C
 
 RingMulticastStrategy.o: RingMulticastStrategy.C RingMulticastStrategy.h \
   DirectMulticastStrategy.h ComlibManager.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2203,17 +2161,16 @@ RingMulticastStrategy.o: RingMulticastStrategy.C RingMulticastStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h ComlibSectionInfo.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
        $(CHARMC) -c -I. RingMulticastStrategy.C
 
 MultiRingMulticast.o: MultiRingMulticast.C MultiRingMulticast.h \
   DirectMulticastStrategy.h ComlibManager.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
   conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
   ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
   CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
@@ -2224,17 +2181,16 @@ MultiRingMulticast.o: MultiRingMulticast.C MultiRingMulticast.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h ComlibSectionInfo.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
        $(CHARMC) -c -I. MultiRingMulticast.C
 
 PipeBroadcastStrategy.o: PipeBroadcastStrategy.C PipeBroadcastStrategy.h \
   ComlibManager.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -2245,17 +2201,16 @@ PipeBroadcastStrategy.o: PipeBroadcastStrategy.C PipeBroadcastStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h pipebroadcastconverse.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h pipebroadcastconverse.h
        $(CHARMC) -c -I. PipeBroadcastStrategy.C
 
 MeshStreamingStrategy.o: MeshStreamingStrategy.C MeshStreamingStrategy.h \
   ComlibManager.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -2266,17 +2221,17 @@ MeshStreamingStrategy.o: MeshStreamingStrategy.C MeshStreamingStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h pup_cmialloc.h MsgPacker.h register.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h pup_cmialloc.h \
+  MsgPacker.h register.h
        $(CHARMC) -c -I. MeshStreamingStrategy.C
 
 PrioStreaming.o: PrioStreaming.C PrioStreaming.h ComlibManager.h \
   charm++.h charm.h converse.h conv-config.h conv-autoconfig.h \
   conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h charm.h ckhashtable.h debug-charm.h \
+  persistent.h conv-onesided.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -2287,17 +2242,17 @@ PrioStreaming.o: PrioStreaming.C PrioStreaming.h ComlibManager.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h StreamingStrategy.h MsgPacker.h register.h pup_cmialloc.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h StreamingStrategy.h \
+  MsgPacker.h register.h pup_cmialloc.h
        $(CHARMC) -c -I. PrioStreaming.C
 
 BroadcastStrategy.o: BroadcastStrategy.C BroadcastStrategy.h \
   ComlibManager.h charm++.h charm.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
   debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
@@ -2308,39 +2263,18 @@ BroadcastStrategy.o: BroadcastStrategy.C BroadcastStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h converse.h \
-  router.h convcomlibmanager.h convcomlibstrategy.h ComlibStats.h \
-  comlib.decl.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlib.h router.h \
+  convcomlibmanager.h ComlibStats.h comlib.decl.h
        $(CHARMC) -c -I. BroadcastStrategy.C
 
 gridrouter.o: gridrouter.C gridrouter.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlib.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
-  petable.h persistent.h
-       $(CHARMC) -c -I. gridrouter.C
-
-de.o: de.C de.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h convcomlib.h charm++.h charm.h converse.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h convcomlib.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
@@ -2348,18 +2282,17 @@ de.o: de.C de.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
   ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
-  trace-bluegene.h router.h petable.h
-       $(CHARMC) -c -I. de.C
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
+  petable.h
+       $(CHARMC) -c -I. gridrouter.C
 
-treerouter.o: treerouter.C treerouter.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlib.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+de.o: de.C de.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
+  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h convcomlib.h charm++.h charm.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
@@ -2368,18 +2301,36 @@ treerouter.o: treerouter.C treerouter.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h router.h petable.h
+       $(CHARMC) -c -I. de.C
+
+treerouter.o: treerouter.C treerouter.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h convcomlib.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
   petable.h
        $(CHARMC) -c -I. treerouter.C
 
 petable.o: petable.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h convcomlib.h charm++.h charm.h converse.h \
-  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
-  charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h conv-config.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  persistent.h conv-onesided.h debug-conv.h convcomlib.h charm++.h \
+  charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h \
+  init.h ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
@@ -2387,38 +2338,56 @@ petable.o: petable.C converse.h conv-config.h conv-autoconfig.h \
   ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
-  trace-bluegene.h router.h petable.h
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
+  petable.h
        $(CHARMC) -c -I. petable.C
 
 3dgridrouter.o: 3dgridrouter.C 3dgridrouter.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlib.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h convcomlib.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
   petable.h
        $(CHARMC) -c -I. 3dgridrouter.C
 
 graphrouter.o: graphrouter.C graphrouter.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlib.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h convcomlib.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
+  petable.h hypercubetopology.h
+       $(CHARMC) -c -I. graphrouter.C
+
+hypercubetopology.o: hypercubetopology.C hypercubetopology.h \
+  graphrouter.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
+  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h convcomlib.h charm++.h charm.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
@@ -2427,101 +2396,58 @@ graphrouter.o: graphrouter.C graphrouter.h converse.h conv-config.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
-  petable.h persistent.h hypercubetopology.h
-       $(CHARMC) -c -I. graphrouter.C
-
-hypercubetopology.o: hypercubetopology.C hypercubetopology.h \
-  graphrouter.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h convcomlib.h charm++.h charm.h converse.h pup.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  ckhashtable.h debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
-  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
-  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
-  trace-bluegene.h router.h petable.h persistent.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h router.h petable.h
        $(CHARMC) -c -I. hypercubetopology.C
 
 routerstrategy.o: routerstrategy.C routerstrategy.h convcomlibmanager.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
-  convcomlib.h charm++.h charm.h converse.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h conv-config.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  convcomlib.h charm++.h charm.h pup.h middle.h middle-conv.h cklists.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
-  convcomlibstrategy.h gridrouter.h petable.h persistent.h graphrouter.h \
-  de.h treerouter.h 3dgridrouter.h prefixrouter.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h router.h gridrouter.h \
+  petable.h graphrouter.h de.h treerouter.h 3dgridrouter.h prefixrouter.h
        $(CHARMC) -c -I. routerstrategy.C
 
 convcomlibmanager.o: convcomlibmanager.C convcomlibmanager.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
-  convcomlib.h charm++.h charm.h converse.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h ckhashtable.h \
-  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h conv-config.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h conv-onesided.h debug-conv.h \
+  convcomlib.h charm++.h charm.h pup.h middle.h middle-conv.h cklists.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h \
-  convcomlibstrategy.h routerstrategy.h gridrouter.h petable.h \
-  persistent.h graphrouter.h de.h treerouter.h 3dgridrouter.h \
-  prefixrouter.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h router.h \
+  routerstrategy.h gridrouter.h petable.h graphrouter.h de.h treerouter.h \
+  3dgridrouter.h prefixrouter.h
        $(CHARMC) -c -I. convcomlibmanager.C
 
 pipebroadcastconverse.o: pipebroadcastconverse.C pipebroadcastconverse.h \
   ckhashtable.h pup.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm++.h charm.h converse.h middle.h \
-  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h charm.h \
-  debug-charm.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h conv-config.h ccs-server.h ckobjQ.h ckreduction.h \
-  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
-  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
-  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
-  CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h \
-  convcomlibmanager.h convcomlib.h router.h convcomlibstrategy.h
-       $(CHARMC) -c -I. pipebroadcastconverse.C
-
-pipelinestrategy.o: pipelinestrategy.C pipelinestrategy.h ckhashtable.h \
-  pup.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h converse.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h charm++.h charm.h converse.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h charm.h debug-charm.h \
+  persistent.h conv-onesided.h debug-conv.h charm++.h charm.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h debug-charm.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
@@ -2530,26 +2456,44 @@ pipelinestrategy.o: pipelinestrategy.C pipelinestrategy.h ckhashtable.h \
   convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
   charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
   sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h \
-  convcomlibmanager.h convcomlib.h router.h convcomlibstrategy.h
+  ckarrayreductionmgr.h trace.h trace-bluegene.h convcomlibmanager.h \
+  convcomlib.h router.h
+       $(CHARMC) -c -I. pipebroadcastconverse.C
+
+pipelinestrategy.o: pipelinestrategy.C pipelinestrategy.h ckhashtable.h \
+  pup.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
+  conv-mach.h conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h conv-onesided.h \
+  debug-conv.h charm++.h charm.h middle.h middle-conv.h cklists.h \
+  ckbitvector.h ckstream.h init.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  convcomlibmanager.h convcomlib.h router.h
        $(CHARMC) -c -I. pipelinestrategy.C
 
 prefixrouter.o: prefixrouter.C prefixrouter.h converse.h conv-config.h \
   conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlib.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h charm.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h conv-config.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
-  convcomlibstrategy.h ComlibLearner.h envelope.h CkFutures.decl.h \
-  charisma.h charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h \
-  sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h conv-trace.h trace-bluegene.h router.h
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h conv-onesided.h debug-conv.h convcomlib.h \
+  charm++.h charm.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h LBDatabase.decl.h NullLB.decl.h \
+  BaseLB.decl.h CkLocation.decl.h CkArray.decl.h ComlibArrayListener.h \
+  ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h envelope.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h router.h
        $(CHARMC) -c -I. prefixrouter.C
 
index f27c9f590cb55996771180d3906492c5f20e4787..f6f00b80a8d06d1acaf257b870e6dfc3366b6e13 100644 (file)
@@ -689,6 +689,9 @@ LIBCKF_CORE=charmf.o charmmod.o
 $(L)/libckf.a: $(LIBCKF_CORE)
        -$(CHARMC) -o $@ $(LIBCKF_CORE) || touch $@
 
+charmf.o:  charmf.C $(CKHEADERS) charmf.h
+       $(CHARMC) -c -I. charmf.C
+
 charmmod.o: charmmod.f90
        -$(CHARMC) -c charmmod.f90 || touch $@
        -$(CHARMC) -cpmod ../include charm.M
@@ -794,10 +797,10 @@ $(L)/libmodulecomlib.a: $(COMLIB_OBJS)
 #
 ###############################################################################
 
-bluegene:  basics
+bigsim:  basics
        $(MAKE) bluegene-target
 
-bluegene-target: charm++ $(L)/libconv-bluegene.a $(L)/libconv-bluegene-logs.a $(L)/libconv-bluegene-stub.a $(L)/libblue-standalone.a METIS
+bluegene-target: charm++ $(L)/libconv-bluegene.a $(L)/libconv-bigsim-logs.a $(L)/libconv-bluegene-stub.a $(L)/libblue-standalone.a METIS
 
 # old (Charm++) Blue Gene emulator
 BlueGene.decl.h BlueGene.def.h : BlueGene.ci charmxi
@@ -808,17 +811,17 @@ $(L)/libbluegene.a: BlueGene.C BlueGene.h BlueGene.decl.h BlueGene.def.h
        $(CHARMC) -o $@ BlueGene.o
 
 # (Converse) Blue Gene emulator
-BLUE_HEADERS = blue_types.h blue_timing.h blue_defs.h blue_logs.h blue.h blue_impl.h blue_network.h
+BLUE_HEADERS = blue_types.h blue_timing.h blue_defs.h bigsim_logs.h blue.h blue_impl.h blue_network.h
 BLUE_OBJS = blue.o blue_node.o blue_proc.o blue_init.o blue_timing.o
-BLUE_IO_OBJS = blue_IO.o blue_logs.o blue_api.o
+BIGSIM_IO_OBJS = bigsim_IO.o bigsim_logs.o bigsim_api.o
 
-LIBBLUE_OBJS = $(BLUE_OBJS) $(BLUE_IO_OBJS) blue_stub.o blue_standalone.o
+LIBBLUE_OBJS = $(BLUE_OBJS) $(BIGSIM_IO_OBJS) blue_stub.o blue_standalone.o
 
 $(L)/libconv-bluegene.a: $(BLUE_OBJS)
        $(CHARMC) -o $@  $(BLUE_OBJS)
 
-$(L)/libconv-bluegene-logs.a: $(BLUE_IO_OBJS)
-       $(CHARMC) -o $@  $(BLUE_IO_OBJS)
+$(L)/libconv-bigsim-logs.a: $(BIGSIM_IO_OBJS)
+       $(CHARMC) -o $@  $(BIGSIM_IO_OBJS)
 
 $(L)/libconv-bluegene-stub.a:  blue_stub.o
        $(CHARMC) -o $@  blue_stub.o
@@ -982,7 +985,7 @@ depends: basics
         fi; \
        echo '#generated by make depends' > $(DEPENDFILE); \
        processFiles='';        \
-        for i in $(LIBCONV_CORE) $(TRACE_OBJS) $(LIBCK_CORE) $(LIBCKF_CORE) $(LB_OBJ) $(LIBBLUE_OBJS) $(CONVERSE_COM_CORE_OBJS) $(COMLIB_OBJS); do \
+        for i in $(LIBCONV_CORE) $(TRACE_OBJS) $(LIBCK_CORE) $(LB_OBJ) $(LIBBLUE_OBJS) $(CONVERSE_COM_CORE_OBJS) $(COMLIB_OBJS); do \
              processed='false';        \
              for f in $$processFiles; do       \
                if test $$i = $$f ; then        \
index d844cc5d264e2632ae2391c2d2db5db7929d9a01..ce94367a7c69c2fdd7dca71f4a2de83b16e5fffc 100755 (executable)
@@ -1231,16 +1231,16 @@ case "$LANGUAGE" in
         POST_LIBRARIES="$POST_LIBRARIES $CMK_F90LIBS"
        ;;
 "bluegene")
-        PRE_LIBRARIES="$PRE_LIBRARIES -lconv-bluegene -lconv-bluegene-logs"
+        PRE_LIBRARIES="$PRE_LIBRARIES -lconv-bluegene -lconv-bigsim-logs"
        ;;
 "ckbluegene")
         POST_LIBRARIES="$POST_LIBRARIES -lbluegene"
        ;;
 "bgcharm++")
-        PRE_LIBRARIES="$PRE_LIBRARIES -lconv-bluegene -lconv-bluegene-logs -lconv-bluegene-stub"
+        PRE_LIBRARIES="$PRE_LIBRARIES -lconv-bluegene -lconv-bigsim-logs -lconv-bluegene-stub"
        ;;
 "bgconverse++")
-        MIDDLE_LIBS="$MIDDLE_LIBS -lconv-bluegene -lconv-bluegene-logs"
+        MIDDLE_LIBS="$MIDDLE_LIBS -lconv-bluegene -lconv-bigsim-logs"
        ;;
 esac