Merge branch 'fattree-conf' into 'master'

Updating base fat tree synthetic .conf

See merge request !16

src/network-workloads/conf/modelnet-synthetic-fattree.conf

@@ -2,36 +2,31 @@ LPGROUPS
 {
    MODELNET_GRP
    {
-      repetitions="4";				
-      #Number of leaf level switches
-      server="2";
-      modelnet_fattree="2";
-      fattree_switch="2";
+      repetitions="32";     # repetitions = Ne = total # of edge switches. For type0 Ne = Np*Ns = ceil(N/Ns*(k/2))*(k/2) = ceil(N/(k/2)^2)*(k/2)
+      server="4";
+      modelnet_fattree="4";
+      fattree_switch="3";
    }
 }
 PARAMS
 {
-   # Only appears to be one type (type=0) in fattree.c
-   ft_type="1";							
-   # Must be 1 < num_levels < 4
-   num_levels="2";						
-   # Some sort of csv string. I'm thinking it's the number of switches per level
-   switch_count="2,4";					
-   # Another csv string. I'm thinking it's the radix of the switches per level. All switches within same level have same radix
-   switch_radix="4,4";						
+   ft_type="0";
    packet_size="512";
-   modelnet_order=( "fattree" );
-   # scheduler options
-   modelnet_scheduler="fcfs";
-   chunk_size="32";
-   # modelnet_scheduler="round-robin";
-   num_vcs="1";
-   vc_size="16384";
-   cn_vc_size="16384";
-   link_bandwidth="5";
-   cn_bandwidth="5";
    message_size="512";
-   routing="minimal";
-   router_delay="50";
+   chunk_size="512";
+   modelnet_scheduler="fcfs";
+   #modelnet_scheduler="round-robin";
+   modelnet_order=( "fattree" );
+   num_levels="3";
+   switch_count="32";       # = repititions
+   switch_radix="8";
+   router_delay="90";
+   terminal_radix="1";
    soft_delay="1000";
+   vc_size="65536";
+   cn_vc_size="65536";
+   link_bandwidth="12.5";
+   cn_bandwidth="12.5";
+   routing="adaptive";
+   rail_routing="adaptive";
 }