X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..20bb321a5cf8f244e33b5562b9dd1d8fb5d4864a:/src/surf/workstation_clm03.cpp

diff --git a/src/surf/workstation_clm03.cpp b/src/surf/workstation_clm03.cpp
index a9bd3d14b9..254c1d1755 100644
--- a/src/surf/workstation_clm03.cpp
+++ b/src/surf/workstation_clm03.cpp
@@ -50,11 +50,6 @@ void surf_workstation_model_init_compound()
   sg_platf_host_add_cb(workstation_new);
 }
 
-WorkstationCLM03Model::WorkstationCLM03Model(const char *name)
- : WorkstationModel(name)
-{}
-
-
 WorkstationCLM03Model::WorkstationCLM03Model()
  : WorkstationModel("Workstation")
 {
@@ -82,7 +77,7 @@ double WorkstationCLM03Model::shareResources(double now){
   adjustWeightOfDummyCpuActions();
 
   double min_by_cpu = p_cpuModel->shareResources(now);
-  double min_by_net = surf_network_model->shareResources(now);
+  double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
   double min_by_sto = -1;
   if (p_cpuModel == surf_cpu_model_pm)
 	min_by_sto = surf_storage_model->shareResources(now);
@@ -139,13 +134,6 @@ ActionPtr WorkstationCLM03Model::executeParallelTask(int workstation_nb,
   return NULL;
 }
 
-/* returns an array of network_link_CM02_t */
-xbt_dynar_t WorkstationCLM03Model::getRoute(WorkstationPtr src, WorkstationPtr dst)
-{
-  XBT_DEBUG("ws_get_route");
-  return surf_network_model->getRoute(src->p_netElm, dst->p_netElm);
-}
-
 ActionPtr WorkstationCLM03Model::communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate){
   return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate);
 }