X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aec1891acd3a43ea3b6c2501ad94239733ee1694..c133768a7de55aa45bb6ca94ae4263ae3d740999:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index a87fa278ff..83bfde3806 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -125,15 +125,7 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -int surf_network_model_description_size = 3 -#ifdef HAVE_GTNETS - + 1 -#endif -#ifdef HAVE_SDP - + 1 -#endif - ; -s_surf_model_description_t surf_network_model_description[] = { +s_surf_model_description_t surf_network_model_description[surf_network_model_description_size] = { {"CM02", NULL, surf_network_model_init_CM02}, #ifdef HAVE_GTNETS {"GTNets", NULL, surf_network_model_init_GTNETS}, @@ -145,13 +137,11 @@ s_surf_model_description_t surf_network_model_description[] = { {"Vegas", NULL, surf_network_model_init_Vegas} }; -int surf_cpu_model_description_size = 1; -s_surf_model_description_t surf_cpu_model_description[] = { +s_surf_model_description_t surf_cpu_model_description[surf_cpu_model_description_size] = { {"Cas01", NULL, surf_cpu_model_init_Cas01}, }; -int surf_workstation_model_description_size = 4; -s_surf_model_description_t surf_workstation_model_description[] = { +s_surf_model_description_t surf_workstation_model_description[surf_workstation_model_description_size] = { {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations}, {"compound", NULL, surf_workstation_model_init_compound, NULL}, {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL}