Cleanup to allow separation of model specification and of optimization mode for each...

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index e9c0cc6..843ea3b 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -339,6 +339,16 @@ static void surf_workstation_model_init_internal(void)
 
 }
 
+void surf_workstation_model_init_current_default(void)
+{
+  surf_workstation_model_init_internal();
+  surf_cpu_model_init_Cas01();
+  im_surf_network_model_init_LegrandVelho();
+
+  xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
+}
+
 /********************************************************************/
 /* The model used in MSG and presented at CCGrid03                  */
 /********************************************************************/
@@ -353,11 +363,9 @@ static void surf_workstation_model_init_internal(void)
 void surf_workstation_model_init_CLM03(void)
 {
   surf_workstation_model_init_internal();
-  surf_cpu_model_init_Cas01_im();
-  im_surf_network_model_init_LegrandVelho();
-  // FIXME: prefer the proper interface instead of bypassing the cfg module that way
-  //xbt_cfg_set_parse(_surf_cfg_set, "network/model:LV08");
-  //xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
+  surf_cpu_model_init_Cas01();
+  surf_network_model_init_CM02();
+
   xbt_dynar_push(model_list, &surf_workstation_model);
   sg_platf_postparse_add_cb(create_workstations);
 }