diff --git a/src/networks/model-net/fattree.c b/src/networks/model-net/fattree.c index da68b0b6e9512f86c181a95012d1bddefc62483c..0089ad4e9fee7466505ee5c1653d1fda8c50bd4b 100644 --- a/src/networks/model-net/fattree.c +++ b/src/networks/model-net/fattree.c @@ -817,7 +817,7 @@ static void fattree_read_config(const char * anno, fattree_param *p){ p->l0_term_size = (p->tapering_ratio - 1)*(p->switch_radix[0]/p->tapering_ratio); if(p->num_levels == 2) { - p->num_switches[1] = p->num_switches[0]/p->tapering_ratio/2; + p->num_switches[1] = p->num_switches[0]/p->tapering_ratio; p->switch_radix[1] = p->switch_radix[0]; p->l1_set_size = p->num_switches[1]; p->l1_term_size = num_terminals; diff --git a/src/networks/model-net/model-net-lp.c b/src/networks/model-net/model-net-lp.c index d156a8da437eee33951ae8d2514a2a0e3cbe9881..3ab9c4a96d2eb98280df9bb9b2fbd15397e16e60 100644 --- a/src/networks/model-net/model-net-lp.c +++ b/src/networks/model-net/model-net-lp.c @@ -645,7 +645,7 @@ void handle_new_msg( exp_time += r->msg_size * codes_cn_delay; exp_time -= tw_now(lp); tw_stime delay = codes_local_latency(lp); - ns->node_copy_next_available_time[queue] = exp_time; + ns->node_copy_next_available_time[queue] = tw_now(lp) + exp_time; int remote_event_size = r->remote_event_size; int self_event_size = r->self_event_size; void *e_msg = (m+1);