Merge branch 'master' of github.com:mquinson/simgrid

diff --cc src/surf/network_cm02.cpp
index c545cf4,64ba10d..1f07518
--- 1/src/surf/network_cm02.cpp
--- 2/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@@ -396,12 -414,17 +396,15 @@@ Action *NetworkCm02Model::communicate(N
  
    if (sg_network_crosstraffic == 1) {
      XBT_DEBUG("Fullduplex active adding backward flow using 5%%");
 -    xbt_dynar_foreach(back_route, i, _link) {
 -      link = static_cast<NetworkCm02Link*>(_link);
 +    for (auto link : *back_route)
        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);
 +  delete route;
    XBT_OUT();
  
    networkCommunicateCallbacks(action, src, dst, size, rate);

diff --cc tools/cmake/Tests.cmake
Simple merge