Merging
authorHarshitha <gplkrsh2@illinois.edu>
Mon, 2 Apr 2012 17:52:01 +0000 (12:52 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Mon, 2 Apr 2012 17:52:01 +0000 (12:52 -0500)
1  2 
src/ck-core/cklocation.C
src/ck-ldb/CentralLB.C
src/ck-ldb/CentralLB.h
src/ck-ldb/MetisLB.C

Simple merge
index d1fef876993af3e728bae1ba559a8d91fc6f22e1,22d856c778d3665102d1f9b57ceb795e7caa67a7..ba78bef06e254b0112293ddfd99bacf55fa79da3
@@@ -1192,17 -770,7 +1195,8 @@@ void CentralLB::ReceiveMigration(LBMigr
    CkCallback cb(CkIndex_CentralLB::ProcessReceiveMigration((CkReductionMsg*)NULL),
                    thisProxy);
    contribute(0, NULL, CkReduction::max_int, cb);
-   // Reset all adaptive lb related fields since load balancing is being done.
-  // adaptive_struct.lb_no_iterations = -1;
-  // adaptive_lbdb.history_data.clear();
-  // adaptive_struct.prev_load = 0.0;
-  // local_state = OFF;
-  // adaptive_struct.lb_period_informed = false;
-  // adaptive_struct.lb_ideal_period = INT_MAX;
-  // adaptive_struct.lb_calculated_period = INT_MAX;
-  // adaptive_struct.lb_msg_send_no = 0;
-  // adaptive_struct.lb_msg_recv_no = 0;
 +
+ #endif
  }
  
  void CentralLB::ProcessReceiveMigration(CkReductionMsg  *msg)
Simple merge
Simple merge