[svn-r19695] Changed the default NPROCS from 3 to 6 for MPI tests.

Tested: in jam only since that is that only parallel tests h5committest
would have done.

2 files changed, 11 insertions, 11 deletions

diff --git a/configure b/configure
index ed4128f..7b23210 100755
--- a/configure
+++ b/configure
@@ -7303,7 +7303,7 @@ $as_echo "$path/mpiexec" >&6; }
       RUNSERIAL="${RUNSERIAL:-none}"
 
       if test -z "$RUNPARALLEL"; then
-        RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=3}"
+        RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=6}"
       fi
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
@@ -7349,7 +7349,7 @@ $as_echo "$path/mpiexec" >&6; }
         RUNSERIAL="${RUNSERIAL:-none}"
 
         if test -z "$RUNPARALLEL"; then
-          RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=2}"
+          RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=6}"
         fi
       else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
@@ -25965,14 +25965,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                 if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
           	for path in `echo $PATH | ${TR} ":" " "`; do
   	  if test -x $path/aprun; then
-            RUNPARALLEL="aprun -q -n \$\${NPROCS:=3}"
+            RUNPARALLEL="aprun -q -n \$\${NPROCS:=6}"
   	    break;
   	  fi
 	done
     fi
 
         if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
-      RUNPARALLEL="mpiexec -n \$\${NPROCS:=3}"
+      RUNPARALLEL="mpiexec -n \$\${NPROCS:=6}"
     fi
     ;;
 
diff --git a/configure.in b/configure.in
index e681580..649edfe 100644
--- a/configure.in
+++ b/configure.in
@@ -695,9 +695,9 @@ dnl			   the executable name to run the executable on
 dnl			   multiple processors. For the serial library the
 dnl			   value will normally be the empty string. For
 dnl			   parallel library it should be something like
-dnl			   `mpiexec -n $$NPROCS' where NPROCS will eventually
-dnl			   contain the number of processors on which to run
-dnl			   the executable (the double dollarsigns are to
+dnl			   "mpiexec -n \$\${NPROCS:=6}" where NPROCS will
+dnl			   eventually contain the number of processors on which
+dnl			   to run the executable (the double dollarsigns are to
 dnl			   protect the expansion until make executes the
 dnl			   command).  The value of this variable is
 dnl			   substituted in *.in files.
@@ -739,7 +739,7 @@ case "$CC_BASENAME" in
       RUNSERIAL="${RUNSERIAL:-none}"
 
       if test -z "$RUNPARALLEL"; then
-        RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=3}"
+        RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=6}"
       fi
     else
       AC_MSG_RESULT([none])
@@ -793,7 +793,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
         RUNSERIAL="${RUNSERIAL:-none}"
 
         if test -z "$RUNPARALLEL"; then
-          RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=2}"
+          RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=6}"
         fi
       else
         AC_MSG_RESULT([none])
@@ -2589,7 +2589,7 @@ case "X-$enable_parallel" in
         dnl Find the path where aprun is located.
   	for path in `echo $PATH | ${TR} ":" " "`; do
   	  if test -x $path/aprun; then
-            RUNPARALLEL="aprun -q -n \$\${NPROCS:=3}"
+            RUNPARALLEL="aprun -q -n \$\${NPROCS:=6}"
   	    break;
   	  fi
 	done
@@ -2597,7 +2597,7 @@ case "X-$enable_parallel" in
 
     dnl Set RUNPARALLEL to mpiexec if not set yet.
     if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
-      RUNPARALLEL="mpiexec -n \$\${NPROCS:=3}"
+      RUNPARALLEL="mpiexec -n \$\${NPROCS:=6}"
     fi
     ;;