[trace] merging instr_variables.c into instr_interface.c (code re-organization)

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index ad9b625..a37608e 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -115,8 +115,6 @@ s_surf_model_description_t surf_network_model_description[] = {
   {"Constant",
    "Simplistic network model where all communication take a constant time (one second)",
    NULL, surf_network_model_init_Constant},
-  {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas",
-   NULL, surf_network_model_init_Vivaldi},
   {"CM02",
    "Realistic network model with lmm_solve and no correction factors",
    NULL, surf_network_model_init_CM02},
@@ -308,10 +306,8 @@ void surf_init(int *argc, char **argv)
     history = tmgr_history_new();
 
   surf_config_init(argc, argv);
-#ifdef HAVE_MC
-  if (_surf_do_model_check)
+  if (MC_IS_ENABLED)
     MC_memory_init();
-#endif
 }
 
 #ifdef _XBT_WIN32
@@ -470,7 +466,7 @@ double surf_solve(double max_date)
   return min;
 }
 
-double surf_get_clock(void)
+XBT_INLINE double surf_get_clock(void)
 {
   return NOW;
 }