[svn-r5708] Purpose:

    Bug Fix
Description:
    I was nullifying the RUNPARALLEL and other macros when I shouldn't
    have been (they were set to sensible things). I also ported the
    RUNPARALLEL macros from the hdf5/config directory to the
    hdf5/fortran/config directory for the powerpc-ibm-[45].x files.
Solution:
    Removed the offending 'RUNPARALLEL=""' lines. Also changed default
    number of processes to 3 instead of 2.

4 files changed, 29 insertions, 21 deletions

diff --git a/fortran/config/powerpc-ibm-aix4.x b/fortran/config/powerpc-ibm-aix4.x
index 9e7cd43..075f451 100644
--- a/fortran/config/powerpc-ibm-aix4.x
+++ b/fortran/config/powerpc-ibm-aix4.x
@@ -6,6 +6,8 @@
 #
 # See BlankForm in this directory for details.
 
+RUNPARALLEL=${RUNPARALLEL="MP_PROCS=3 MP_TASKS_PER_NODE=3 poe"}
+
 # Cross compiling defaults
 ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
 ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
diff --git a/fortran/config/powerpc-ibm-aix5.x b/fortran/config/powerpc-ibm-aix5.x
index 9e7cd43..075f451 100644
--- a/fortran/config/powerpc-ibm-aix5.x
+++ b/fortran/config/powerpc-ibm-aix5.x
@@ -6,6 +6,8 @@
 #
 # See BlankForm in this directory for details.
 
+RUNPARALLEL=${RUNPARALLEL="MP_PROCS=3 MP_TASKS_PER_NODE=3 poe"}
+
 # Cross compiling defaults
 ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
 ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
diff --git a/fortran/configure b/fortran/configure
index dd6ab01..334141c 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -8088,10 +8088,10 @@ ac_link='${F9X-f90} -o conftest${ac_exeext} $FFLAGS conftest.$ac_ext $LDFLAGS $L
 cross_compiling=$ac_cv_prog_f9x_cross
 
 
- PARALLEL=""
- RUNSERIAL=""
- RUNPARALLEL=""
- TESTPARALLEL=""
+
+
+
+
 
 case "$F9X" in
   mpif90)
@@ -8114,9 +8114,8 @@ echo $ECHO_N "checking for mpirun... $ECHO_C" >&6
       echo "$as_me:$LINENO: result: $path/mpirun" >&5
 echo "${ECHO_T}$path/mpirun" >&6
       RUNSERIAL="${RUNSERIAL:-none}"
-
       if test -z "$RUNPARALLEL"; then
-        RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}"
+        RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=3}"
       fi
     else
       echo "$as_me:$LINENO: result: none" >&5
@@ -8315,8 +8314,8 @@ rm -rf conftest*
 
     fi
 
-        if test "X$PARALLEL" = "Xyes" && test -z "$RUNPARALLEL"; then
-      RUNPARALLEL="mpirun -np \$\${NPROCS:=2}"
+        if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
+      RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"
     fi
     ;;
 
diff --git a/fortran/configure.in b/fortran/configure.in
index aa7b68d..666f9a3 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -1,10 +1,16 @@
-dnl ----------------------------------------------------------------------
 dnl Process this file with autoconf to produce configure.
 dnl
-dnl Copyright (C) 2000, 2001, 2002
-dnl     National Center for Supercomputing Applications.
-dnl     All rights reserved.
-dnl ----------------------------------------------------------------------
+dnl Copyright by the Board of Trustees of the University of Illinois.
+dnl All rights reserved.
+dnl
+dnl This file is part of HDF5.  The full HDF5 copyright notice, including
+dnl terms governing use, modification, and redistribution, is contained in
+dnl the files COPYING and Copyright.html.  COPYING can be found at the root
+dnl of the source code distribution tree; Copyright.html can be found at the
+dnl root level of an installed copy of the electronic HDF5 document set and
+dnl is linked from the top-level documents page.  It can also be found at
+dnl http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+dnl access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 
 dnl ----------------------------------------------------------------------
 dnl Initialize configure.
@@ -455,10 +461,10 @@ dnl			   protect the expansion until make executes the
 dnl			   command).  The value of this variable is
 dnl			   substituted in *.in files.
 dnl
-AC_SUBST(PARALLEL) PARALLEL=""
-AC_SUBST(RUNSERIAL) RUNSERIAL=""
-AC_SUBST(RUNPARALLEL) RUNPARALLEL=""
-AC_SUBST(TESTPARALLEL) TESTPARALLEL=""
+AC_SUBST(PARALLEL)
+AC_SUBST(RUNSERIAL)
+AC_SUBST(RUNPARALLEL)
+AC_SUBST(TESTPARALLEL)
 
 dnl ----------------------------------------------------------------------
 dnl If the compiler is obviously a parallel compiler then we're building
@@ -490,9 +496,8 @@ case "$F9X" in
     if test -x $path/mpirun; then
       AC_MSG_RESULT($path/mpirun)
       RUNSERIAL="${RUNSERIAL:-none}"
-
       if test -z "$RUNPARALLEL"; then
-        RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}"
+        RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=3}"
       fi
     else
       AC_MSG_RESULT(none)
@@ -554,8 +559,8 @@ case "X-$enable_parallel" in
     fi
 
     dnl Set RUNPARALLEL to mpirun if not set yet.
-    if test "X$PARALLEL" = "Xyes" && test -z "$RUNPARALLEL"; then
-      RUNPARALLEL="mpirun -np \$\${NPROCS:=2}"
+    if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then
+      RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"
     fi
     ;;