X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7f3c30ef936dacf568b44009d3948c8dc64228c..467944fe0ac76fb00b1e9b3a919b1ce4a165ef0f:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 5b31c8b398..427af07a47 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -116,6 +116,7 @@ s_surf_model_description_t surf_network_model_description[] = {
     {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas", NULL, surf_network_model_init_Vivaldi},
   {"CM02", "Realistic network model with lmm_solve and no correction factors", NULL, surf_network_model_init_CM02},
   {"LV08", "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775" , NULL, surf_network_model_init_LegrandVelho},
+  {"SMPI", "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)", NULL, surf_network_model_init_SMPI},
 #ifdef HAVE_GTNETS
   {"GTNets", "Network Pseudo-model using the GTNets simulator instead of an analytic model", NULL, surf_network_model_init_GTNETS},
 #endif
@@ -244,7 +245,7 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
 XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
 XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
 XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-XBT_LOG_EXTERNAL_CATEGORY(surf_routing);
+XBT_LOG_EXTERNAL_CATEGORY(surf_route);
 
 
 #ifdef HAVE_GTNETS
@@ -265,7 +266,7 @@ void surf_init(int *argc, char **argv)
   XBT_LOG_CONNECT(surf_timer, surf);
   XBT_LOG_CONNECT(surf_workstation, surf);
   XBT_LOG_CONNECT(surf_config, surf);
-  XBT_LOG_CONNECT(surf_routing, surf);
+  XBT_LOG_CONNECT(surf_route, surf);
 
 #ifdef HAVE_GTNETS
   XBT_LOG_CONNECT(surf_network_gtnets, surf);