From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Fri, 8 Apr 2011 13:10:27 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
X-Git-Tag: v3.6_beta2~59^2~11^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1dc68fca3f3bd110ddaaf88fb90a8bbb83a584b2?hp=5bbb1483886ba3113ddd8d631066389d8850f0e4

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
index 0000000000..6205cb4ae2
--- /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 41de955d7b..71e0f89146 100644
--- 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;