Merge branch 'oldstyle_element_set'

[simgrid.git] / src / surf / network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 62c2f41..dc0d4f9 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -418,7 +418,9 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
       link = static_cast<NetworkCm02Link*>(_link);
       lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), .05);
     }
-    lmm_variable_concurrency_share_set(action->getVariable(),2);
+    //Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency
+    //(You would also have to change lmm_element_concurrency())
+    //lmm_variable_concurrency_share_set(action->getVariable(),2);
   }
 
   xbt_dynar_free(&route);