Use the LV08 model by default

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6660 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index 90f9721..b32a57c 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -561,7 +561,7 @@ void surf_network_model_init_LegrandVelho(const char *filename)
   weight_S_parameter = 8775;
 
   update_model_description(surf_network_model_description,
   weight_S_parameter = 8775;
 
   update_model_description(surf_network_model_description,

-                           "LegrandVelho", surf_network_model);
+                           "LV08", surf_network_model);

 }
 
 /***************************************************************************/
 }
 
 /***************************************************************************/

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 20f24c4..052aea2 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -114,7 +114,7 @@ xbt_dynar_t surf_path = NULL;
 s_surf_model_description_t surf_network_model_description[] = {
   {"Constant", NULL, surf_network_model_init_Constant},
   {"CM02", NULL, surf_network_model_init_CM02},
 s_surf_model_description_t surf_network_model_description[] = {
   {"Constant", NULL, surf_network_model_init_Constant},
   {"CM02", NULL, surf_network_model_init_CM02},

-  {"LegrandVelho", NULL, surf_network_model_init_LegrandVelho},
+  {"LV08", NULL, surf_network_model_init_LegrandVelho},

 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},
 #endif
 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},
 #endif

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index a9e2ba2..ec30531 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -147,7 +147,7 @@ void surf_config_init(int *argc, char **argv)
       p +=
         sprintf(p, "%s%s", (i == 0 ? "" : ", "),
                 surf_network_model_description[i].name);
       p +=
         sprintf(p, "%s%s", (i == 0 ? "" : ", "),
                 surf_network_model_description[i].name);

-    default_value = xbt_strdup("CM02");
+    default_value = xbt_strdup("LV08");

     xbt_cfg_register(&_surf_cfg_set,
                      "network_model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__network_model,
     xbt_cfg_register(&_surf_cfg_set,
                      "network_model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__network_model,


@@ -225,7 +225,7 @@ void surf_config_models_setup(const char *platform_file)
   char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
   char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
 
   char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
   char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
 

-  if ((strcmp(network_model_name,"CM02") || strcmp(cpu_model_name,"Cas01"))
+  if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))

       && !strcmp(workstation_model_name, "CLM03")){
     const char *val = "compound";
     INFO0("Switching workstation model to compound since you changed the network and/or cpu model(s)");
       && !strcmp(workstation_model_name, "CLM03")){
     const char *val = "compound";
     INFO0("Switching workstation model to compound since you changed the network and/or cpu model(s)");