X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc4d29e13ac8f50db7bf282457140561048c7ed6..25075d4291d4336a78b61f058a20903caeb8dd96:/src/msg/environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 31aa28979e..07fccf280e 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -5,16 +5,18 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_environment, msg,
 				"Logging specific to MSG (environment)");
 
 /** \defgroup msg_easier_life      Platform and Application management
  *  \brief This section describes functions to manage the platform creation
  *  and the application deployment. You should also have a look at 
  *  \ref MSG_examples  to have an overview of their usage.
+ *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Platforms and Applications" --> \endhtmlonly
+ * 
  */
 
 /********************************* MSG **************************************/
@@ -66,11 +68,14 @@ void MSG_create_environment(const char *file) {
   surf_timer_resource_init(file);
 
   /* which model do you want today? */
-  xbt_cfg_get_string (_msg_cfg_set, "surf_workstation_model",
-		      &workstation_model_name);
+  workstation_model_name = xbt_cfg_get_string (_msg_cfg_set, "surf_workstation_model");
+
   DEBUG1("Model : %s", workstation_model_name);
   if (!strcmp(workstation_model_name,"KCCFLN05")) {
     surf_workstation_resource_init_KCCFLN05(file);
+  }
+  else if (!strcmp(workstation_model_name,"KCCFLN05_proportionnal")) {
+    surf_workstation_resource_init_KCCFLN05_proportionnal(file);
   } else if (!strcmp(workstation_model_name,"CLM03")) {
     surf_workstation_resource_init_CLM03(file);
   } else {