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

diff --git a/examples/smpi/NAS/EP-sampling/Makefile b/examples/smpi/NAS/EP-sampling/Makefile
new file mode 100644 (file)
index 0000000..6205cb4
--- /dev/null
+++ b/examples/smpi/NAS/EP-sampling/Makefile
@@ -0,0 +1,28 @@
+SHELL=/bin/sh
+BENCHMARK=ep
+BENCHMARKU=EP
+
+include ../config/make.def
+
+#OBJS = ep.o ${COMMON}/print_results.o ${COMMON}/${RAND}.o ${COMMON}/timers.o
+OBJS = ep.o randlc.o
+
+include ../sys/make.common
+
+${PROGRAM}: config ${OBJS}
+#      ${FLINK} ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${FMPI_LIB}
+       ${CLINK} ${CLINKFLAGS} -o ${PROGRAM} ${OBJS} ${CMPI_LIB}
+
+
+#ep.o:         ep.f  mpinpb.h npbparams.h
+#      ${FCOMPILE} ep.f
+
+ep.o:  ep.c randlc.c ../EP/mpinpb.h npbparams.h
+       ${CCOMPILE} ep.c
+
+clean:
+       - rm -f *.o *~ 
+       - rm -f npbparams.h core
+
+
+

diff --git a/examples/smpi/NAS/EP-sampling/ep.c b/examples/smpi/NAS/EP-sampling/ep.c
index 41de955..71e0f89 100644 (file)
--- a/examples/smpi/NAS/EP-sampling/ep.c
+++ b/examples/smpi/NAS/EP-sampling/ep.c
@@ -246,7 +246,7 @@
          k_offset = no_large_nodes*(np+1) + (node-no_large_nodes)*np -1;
      
       int stop = false;
-      for(k = 1; k <= np; k++) SMPI_SAMPLE_LOCAL(0.25 * np) {
+      for(k = 1; k <= np; k++) SMPI_SAMPLE_LOCAL(0.25 * np, 0.03) {
          stop = false;
          kk = k_offset + k ;
          t1 = s;