Commit that breaks most tesh files by changing the default model but setting them...

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 65ffb94..a75a59c 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -360,7 +360,7 @@ void surf_config_init(int *argc, char **argv)
                    surf_workstation_model_description[i].name);
     sprintf(p,
             ".\n       (use 'help' as a value to see the long description of each model)");
                    surf_workstation_model_description[i].name);
     sprintf(p,
             ".\n       (use 'help' as a value to see the long description of each model)");

-    default_value = xbt_strdup("CLM03");
+    default_value = xbt_strdup("current_default");

     xbt_cfg_register(&_surf_cfg_set,
                      "workstation/model", description, xbt_cfgelm_string,
                      &default_value, 1, 1,
     xbt_cfg_register(&_surf_cfg_set,
                      "workstation/model", description, xbt_cfgelm_string,
                      &default_value, 1, 1,

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 2361121..4b52525 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -342,7 +342,7 @@ static void surf_workstation_model_init_internal(void)
 void surf_workstation_model_init_current_default(void)
 {
   surf_workstation_model_init_internal();
 void surf_workstation_model_init_current_default(void)
 {
   surf_workstation_model_init_internal();

-  xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);
+  //xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);

   surf_cpu_model_init_Cas01();
   im_surf_network_model_init_LegrandVelho();
 
   surf_cpu_model_init_Cas01();
   im_surf_network_model_init_LegrandVelho();