Merging mpi-sim-layer-test with codes-net

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

@@ -2064,11 +2064,11 @@ get_next_stop(router_state * s,
   /* It means the packet has arrived at the destination group. Now divert it to the destination router. */
   if(s->group_id == dest_group_id)
    {
-     //if(msg->last_hop == TERMINAL && path == NON_MINIMAL) {
-     //  dest_lp = (s->group_id * s->params->num_routers) + intm_id % s->params->num_routers;
-     //} else {
+     if(msg->last_hop == TERMINAL && path == NON_MINIMAL) {
+       dest_lp = (s->group_id * s->params->num_routers) + intm_id % s->params->num_routers;
+     } else {
      dest_lp = dest_router_id;
-     //}
+     }
    }
    else
    {

tests/conf/modelnet-p2p-bw-loggp.conf

@@ -10,7 +10,7 @@ LPGROUPS
 PARAMS
 {
    packet_size="2147483648";
-   message_size="312";
+   message_size="352";
    modelnet_order=( "loggp" );
    # scheduler options
    modelnet_scheduler="fcfs";

tests/conf/modelnet-prio-sched-test.conf

@@ -10,7 +10,7 @@ LPGROUPS
 PARAMS
 {
    packet_size="512";
-   message_size="312";
+   message_size="352";
    modelnet_order=( "simplenet" );
    # scheduler options
    modelnet_scheduler="priority";

tests/conf/modelnet-test-dragonfly.conf

@@ -23,6 +23,6 @@ PARAMS
    local_bandwidth="5.25";
    global_bandwidth="4.7";
    cn_bandwidth="5.25";
-   message_size="336";
+   message_size="352";
    routing="nonminimal";
 }

tests/conf/modelnet-test-loggp.conf

@@ -9,7 +9,7 @@ LPGROUPS
 }
 PARAMS
 {
-   message_size="336";
+   message_size="352";
    modelnet_order=( "loggp" );
    # scheduler options
    modelnet_scheduler="fcfs-full";

tests/conf/modelnet-test-torus.conf

@@ -14,7 +14,7 @@ PARAMS
    # scheduler options
    modelnet_scheduler="fcfs";
    # modelnet_scheduler="round-robin";
-   message_size="336";
+   message_size="352";
    n_dims="4";
    dim_length="4,2,2,2";
    link_bandwidth="2.0";

tests/conf/modelnet-test.conf

@@ -10,7 +10,7 @@ LPGROUPS
 PARAMS
 {
    packet_size="512";
-   message_size="336";
+   message_size="352";
    modelnet_order=( "simplenet" );
    # scheduler options
    modelnet_scheduler="fcfs";