Adding rzmerl and vulcan tests.

AUTOTEST/cronfile

@@ -18,6 +18,8 @@
 # Rob's crontab (on rzcereal2)
 
 40 0 * * * source /etc/profile; source $HOME/.profile; cd $HOME/hypre/testing/AUTOTEST; ./autotest.sh -checkout   > autotest-rzcereal2-checkout.out 2>&1
+00 1 * * 2 source /etc/profile; source $HOME/.profile; cd $HOME/hypre/testing/AUTOTEST; ./autotest.sh -vulcan    >> autotest-vulcan-cron.out    2>> autotest-vulcan-cron.err
+00 1 * * 3 source /etc/profile; source $HOME/.profile; cd $HOME/hypre/testing/AUTOTEST; ./autotest.sh -rzmerl    >> autotest-rzmerl-cron.out    2>> autotest-rzmerl-cron.err
 00 3 * * 3 source /etc/profile; source $HOME/.profile; cd $HOME/hypre/testing/AUTOTEST; ./autotest.sh -rzcereal3 >> autotest-rzcereal3-cron.out 2>> autotest-rzcereal3-cron.err
 00 1 * * 4 source /etc/profile; source $HOME/.profile; cd $HOME/hypre/testing/AUTOTEST; ./autotest.sh -rzzeus    >> autotest-rzzeus-cron.out    2>> autotest-rzzeus-cron.err
 00 5 * * * source /etc/profile; source $HOME/.profile; cd $HOME/hypre/testing/AUTOTEST; ./autotest.sh -summary-copy tux339:/usr/casc/hypre/testing

AUTOTEST/machine-rzmerl.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+#BHEADER**********************************************************************
+# Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+# This file is part of HYPRE.  See file COPYRIGHT for details.
+#
+# HYPRE is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License (as published by the Free
+# Software Foundation) version 2.1 dated February 1999.
+#
+# $Revision$
+#EHEADER**********************************************************************
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on the rzmerl machine ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: {src_dir}  is the hypre source directory
+          -h|-help   prints this usage information and exits
+
+   This script runs a number of tests suitable for the rzmerl machine.
+
+   Example usage: $0 ..
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=$1
+shift
+
+# Test runtest tests
+./test.sh openmp.sh $src_dir
+mv -f openmp.??? $output_dir
+
+# Test linking for different languages
+link_opts="all++ all77"
+for opt in $link_opts
+do
+   output_subdir=$output_dir/link$opt
+   mkdir -p $output_subdir
+   ./test.sh link.sh $src_dir $opt
+   mv -f link.??? $output_subdir
+done
+
+# Test other builds (last one is the default build)
+configure_opts="--enable-debug:--enable-bigint: "
+# temporarily change word delimeter to allow spaces in options
+tmpIFS=$IFS; IFS=:
+for opt in $configure_opts
+do
+    # only use first part of $opt for subdir name
+    output_subdir=$output_dir/build`echo $opt | awk '{print $1}'`
+    mkdir -p $output_subdir
+    ./test.sh configure.sh $src_dir $opt 
+    mv -f configure.??? $output_subdir
+    ./test.sh make.sh $src_dir test
+    mv -f make.??? $output_subdir
+done
+IFS=$tmpIFS
+
+# Echo to stderr all nonempty error files in $output_dir
+for errfile in $( find $output_dir ! -size 0 -name "*.err" )
+do
+   echo $errfile >&2
+done

AUTOTEST/machine-tux.sh

@@ -62,10 +62,9 @@ if [ -d $src_dir/babel-runtime ]; then
 fi
 
 # Test other builds (last one is the default build)
-# temporarily change word delimeter in order to have spaces in options
-tmpIFS=$IFS
-IFS=:
 configure_opts="--without-MPI:--with-strict-checking:--enable-shared:--with-no-global-partition --with-insure:--enable-bigint --enable-debug:--enable-maxdim=4 --enable-debug:--enable-complex --enable-maxdim=4 --enable-debug: "
+# temporarily change word delimeter to allow spaces in options
+tmpIFS=$IFS; IFS=:
 for opt in $configure_opts
 do
    # only use first part of $opt for subdir name

AUTOTEST/machine-vulcan.sh

@@ -0,0 +1,79 @@
+#!/bin/sh
+#BHEADER**********************************************************************
+# Copyright (c) 2008,  Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+# This file is part of HYPRE.  See file COPYRIGHT for details.
+#
+# HYPRE is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License (as published by the Free
+# Software Foundation) version 2.1 dated February 1999.
+#
+# $Revision$
+#EHEADER**********************************************************************
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on the vulcan cluster ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: {src_dir}  is the hypre source directory
+          -h|-help   prints this usage information and exits
+
+      This script runs a number of tests suitable for the vulcan cluster.
+
+      Example usage: $0 ..
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=$1
+shift
+
+# Test runtest tests
+./test.sh default.sh $src_dir
+mv -f default.??? $output_dir
+
+# Test linking for different languages
+link_opts="all++ all77"
+for opt in $link_opts
+do
+   output_subdir=$output_dir/link$opt
+   mkdir -p $output_subdir
+   ./test.sh link.sh $src_dir $opt
+   mv -f link.??? $output_subdir
+done
+
+# Test other builds
+configure_opts="--enable-debug:--enable-bigint"
+# temporarily change word delimeter to allow spaces in options
+tmpIFS=$IFS; IFS=:
+for opt in $configure_opts
+do
+   # only use first part of $opt for subdir name
+   output_subdir=$output_dir/build`echo $opt | awk '{print $1}'`
+   mkdir -p $output_subdir
+   ./test.sh configure.sh $src_dir $opt 
+   mv -f configure.??? $output_subdir
+   ./test.sh make.sh $src_dir test
+   mv -f make.??? $output_subdir
+done
+IFS=$tmpIFS
+
+# Echo to stderr all nonempty error files in $output_dir
+for errfile in $( find $output_dir ! -size 0 -name "*.err" )
+do
+   echo $errfile >&2
+done

AUTOTEST/testdist.sh

@@ -13,7 +13,7 @@
 
 # Which tests to run?
 TEST_ALPHA="-tux339"
-TEST_BETA="$TEST_ALPHA -rzzeus -hera -rzdawndev"
+TEST_BETA="$TEST_ALPHA -rzzeus -rzmerl -vulcan"
 TEST_GENERAL="$TEST_BETA"
 TERMCMD=""
 

test/runtest.sh

@@ -52,18 +52,6 @@ function usage
 function MpirunString
 {
    case $HOST in
-      alc*) shift
-         RunString="srun -p pdebug -n$*"
-         ;;
-      peng*) shift
-         RunString="srun -p pdebug -n$*"
-         ;;
-      thun*) shift
-         RunString="srun -p pdebug -n$*"
-         ;;
-      vert*) shift
-         RunString="srun -p pdebug -n$*"
-         ;;
       *bgl*) shift
          BatchMode=1
          MY_NUM_TASKS=$1  
@@ -97,7 +85,7 @@ function MpirunString
          RunString="mpirun -verbose 1 -np $MY_NUM_TASKS -exe $MY_EXECUTE_JOB"
          RunString="${RunString} -cwd $MY_EXECUTE_DIR -args \" $MY_ARGS \" "
          ;;
-      hera*) shift
+      rzzeus*|rzmerl*|ansel*|aztec*|cab*|sierra*|vulcan*) shift
          if [ $NumThreads -gt 0 ] ; then
             export OMP_NUM_THREADS=$NumThreads
             RunString="srun -p pdebug -c $NumThreads -n$*"
@@ -105,12 +93,6 @@ function MpirunString
             RunString="srun -p pdebug -n$*"
          fi
          ;;
-      *zeus*) shift
-         RunString="srun -p pdebug -n$*"
-         ;;
-      atla*) shift
-         RunString="srun -p pdebug -n$*"
-         ;;
       tux*) BatchMode=0
          if [ $NumThreads -gt 0 ] ; then
             export OMP_NUM_THREADS=$NumThreads