From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 25 Dec 2011 16:09:01 +0000 (+0100)
Subject: properly kill deprecated option that were recently added
X-Git-Tag: exp_20120216~235
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/033b1246e6eb1fc4e6322dc561de751dc53d29e4

properly kill deprecated option that were recently added
---

diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c
index 8c2abcf91b..8de56eda93 100644
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -732,15 +732,8 @@ static void surf_cpu_model_init_internal()
 void surf_cpu_model_init_Cas01()
 {
   char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim");
-  char *model = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
   int select = xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update");
 
-  if(!strcmp(model,"Cas01_fullupdate")) {
-    XBT_WARN("[*Deprecated*. Use --cfg=cpu/model:Cas01 with option --cfg=cpu/optim:Full instead.]");
-  } else if(!strcmp(model,"CpuTI")) {
-    XBT_WARN("[*Deprecated*. Use --cfg=cpu/model:Cas01 with option --cfg=cpu/optim:TI instead.]");
-  }
-
   if(!strcmp(optim,"Full")) {
     cpu_update_mechanism = UM_FULL;
     selective_update = select;
diff --git a/src/surf/network.c b/src/surf/network.c
index 6d43cd88e6..cdaddf0f51 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -1107,14 +1107,9 @@ void surf_network_model_init_SMPI(void)
 /*  } */
 void surf_network_model_init_LegrandVelho(void)
 {
-  char *model = xbt_cfg_get_string(_surf_cfg_set, "network/model");
-
   if (surf_network_model)
     return;
 
-  if(!strcmp(model,"LV08_fullupdate")) {
-    XBT_WARN("[*Deprecated*. Use --cfg=network/model:LV08 with option --cfg=network/optim:Full instead.]");
-  }
   set_update_mechanism();
 
   surf_network_model_init_internal();
diff --git a/src/surf/surf.c b/src/surf/surf.c
index 5e5937ffaf..83ccca74be 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -148,14 +148,9 @@ 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 */
 };