kill the deprecated CLM03 workstation model

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 5e5937f..2fb0493 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -148,24 +148,16 @@ s_surf_model_description_t surf_network_model_description[] = {
 };
 
 s_surf_model_description_t surf_cpu_model_description[] = {
-  {"Cas01_fullupdate", "CPU classical model time=size/power (Cas01). [Deprecated. Use Cas01 with option --cfg=cpu/optim:Full. The Full option updates all actions at every step, which may be useful for debug.]",
-   surf_cpu_model_init_Cas01},
   {"Cas01",
    "Simplistic CPU model (time=size/power).",
    surf_cpu_model_init_Cas01},
-  {"CpuTI",
-   "CPU classical model time=size/power (Cas01). [Deprecated. Use Cas01 with option --cfg=cpu/optim:TI. The TI optimization is highly optimized when using traces]",
-   surf_cpu_model_init_ti},
   {NULL, NULL,  NULL}      /* this array must be NULL terminated */
 };
 
 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},