From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Mon, 11 Feb 2013 14:50:39 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_9_90~510
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fbb6b4556c347a1dec9e462574fdc2967f494002?hp=aea5d35ed8a14cebc1269fe2e6158d4ec3ad3a35

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index bdede7a838..861ed116ca 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -15,7 +15,7 @@ NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}"
 NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
 POWER="${DEFAULT_POWER}"
 
-SIMOPTS="--cfg=maxmin/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304"
+SIMOPTS="--cfg=maxmin/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304 --cfg=smpi/display_timing:1"
 
 #usage to print the way this script should be called
 function usage () {