Removing g_tw_lookahead additions from model-net

src/models/networks/model-net/dragonfly.c

@@ -311,7 +311,7 @@ static tw_stime dragonfly_packet_event(char* category, tw_lpid final_dest_lp, ui
     terminal_message * msg;
     tw_lpid dest_nic_id;
     char* tmp_ptr;
-//    printf("\n g_tw_lookahead default %f", g_tw_lookahead);
+//    printf("\n g_tw_lookahead default %f src lp %d sender %d ", g_tw_lookahead, src_lp, sender->gid);
 #if 0
     char lp_type_name[MAX_NAME_LENGTH], lp_group_name[MAX_NAME_LENGTH];
 
@@ -323,7 +323,7 @@ static tw_stime dragonfly_packet_event(char* category, tw_lpid final_dest_lp, ui
     codes_mapping_get_lp_info(final_dest_lp, lp_group_name, &mapping_grp_id, &mapping_type_id, lp_type_name, &mapping_rep_id, &mapping_offset);
     codes_mapping_get_lp_id(lp_group_name, LP_CONFIG_NM, mapping_rep_id, mapping_offset, &dest_nic_id);
   
-    xfer_to_nic_time = g_tw_lookahead + codes_local_latency(sender); /* Throws an error of found last KP time > current event time otherwise when LPs of one type are placed together*/
+    xfer_to_nic_time = codes_local_latency(sender); /* Throws an error of found last KP time > current event time otherwise when LPs of one type are placed together*/
     //printf("\n transfer in time %f %f ", xfer_to_nic_time+offset, tw_now(sender));
     //e_new = tw_event_new(sender->gid, xfer_to_nic_time+offset, sender);
     //msg = tw_event_data(e_new);
@@ -718,7 +718,7 @@ void dragonfly_collective(char* category, int message_size, int remote_event_siz
     codes_mapping_get_lp_info(sender->gid, lp_group_name, &mapping_grp_id, &mapping_type_id, lp_type_name, &mapping_rep_id, &mapping_offset);
     codes_mapping_get_lp_id(lp_group_name, LP_CONFIG_NM, mapping_rep_id, mapping_offset, &local_nic_id);
 
-    xfer_to_nic_time = g_tw_lookahead + codes_local_latency(sender);
+    xfer_to_nic_time = codes_local_latency(sender);
     e_new = model_net_method_event_new(local_nic_id, xfer_to_nic_time,
             sender, DRAGONFLY, (void**)&msg, (void**)&tmp_ptr);
 

src/models/networks/model-net/model-net-lp.c

@@ -225,7 +225,7 @@ void handle_new_msg(
     
     if (ns->in_sched_loop == 0){
         b->c0 = 1;
-        tw_event *e = codes_event_new(lp->gid, g_tw_lookahead + codes_local_latency(lp), lp);
+        tw_event *e = codes_event_new(lp->gid, codes_local_latency(lp), lp);
         model_net_wrap_msg *m = tw_event_data(e);
         m->event_type = MN_BASE_SCHED_NEXT;
         m->magic = model_net_base_magic;
@@ -265,7 +265,7 @@ void handle_sched_next(
     }
     else {
         tw_event *e = codes_event_new(lp->gid, 
-                poffset+codes_local_latency(lp) + g_tw_lookahead, lp);
+                poffset+codes_local_latency(lp), lp);
         model_net_wrap_msg *m = tw_event_data(e);
         m->event_type = MN_BASE_SCHED_NEXT;
         m->magic = model_net_base_magic;

src/models/networks/model-net/model-net.c

@@ -178,7 +178,7 @@ static void model_net_event_impl_base(
     }
 
     tw_lpid mn_lp = model_net_find_local_device(net_id, sender);
-    tw_stime poffset = g_tw_lookahead + codes_local_latency(sender);
+    tw_stime poffset = codes_local_latency(sender);
     if (in_sequence){
         tw_stime tmp = mn_msg_offset;
         mn_msg_offset += poffset;