kill the deprecated CLM03 workstation model

diff --git a/ChangeLog b/ChangeLog
index 87ba11b..1b4c255 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ SimGrid (3.7) NOT RELEASED; urgency=low
     (e.g., --cfg=network/optim:lazy --cfg=cpu/optim:TI).
     Incompatible combinations should err at initialization. See
     --help-models for the list of all models and optimization modes.
+  * The CLM03 workstation model were dropped for simplicity because it
+    used the deprecated CM02 network model. Use default instead.
   * Use now crosstraffic keyword instead of the terribly missleading 
     fullduplex keyword. Use --cfg=network/crosstraffic:1. This is
     activated by default now in the current default model.

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 83ccca7..2fb0493 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -155,12 +155,9 @@ s_surf_model_description_t surf_cpu_model_description[] = {
 };
 
 s_surf_model_description_t surf_workstation_model_description[] = {
-  {"current_default",
-   "Curent default workstation model (may change with versions of SimGrid). Currently Cas01 and LV08 (with full duplex support) as CPU and Network",
+  {"default",
+   "Default workstation model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)",
    surf_workstation_model_init_current_default},
-  {"CLM03",
-   "Default workstation model, using Cas01 and CM02 as CPU and Network",
-   surf_workstation_model_init_CLM03},
   {"compound",
    "Workstation model that is automatically chosen if you change the network and CPU models",
    surf_workstation_model_init_compound},

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 3f0b344..424c1b3 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -355,27 +355,6 @@ void surf_workstation_model_init_current_default(void)
   sg_platf_postparse_add_cb(create_workstations);
 }
 
-/********************************************************************/
-/* The model used in MSG and presented at CCGrid03                  */
-/********************************************************************/
-/* @InProceedings{Casanova.CLM_03, */
-/*   author = {Henri Casanova and Arnaud Legrand and Loris Marchal}, */
-/*   title = {Scheduling Distributed Applications: the SimGrid Simulation Framework}, */
-/*   booktitle = {Proceedings of the third IEEE International Symposium on Cluster Computing and the Grid (CCGrid'03)}, */
-/*   publisher = {"IEEE Computer Society Press"}, */
-/*   month = {may}, */
-/*   year = {2003} */
-/* } */
-void surf_workstation_model_init_CLM03(void)
-{
-  surf_workstation_model_init_internal();
-  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);
-}
-
 void surf_workstation_model_init_compound()
 {