--- MITgcm/verification/testreport	2003/09/10 02:30:37	1.6
+++ MITgcm/verification/testreport	2003/09/16 17:46:52	1.8
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.6 2003/09/10 02:30:37 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.8 2003/09/16 17:46:52 edhill Exp $
 #
 
 usage()
@@ -10,6 +10,7 @@
     echo
     echo "where possible OPTIONS are:"
     echo "  (-help|-h)               print usage"
+    echo "  (-mpi)                   use MPI input files"
     echo "  (-optfile=|-of=)STRING   list of optfiles to use"
     echo "  (-a|-addr)STRING         list of email recipients"
     echo "                             (DEF=\"edhill@mitgcm.org\")"
@@ -19,6 +20,8 @@
     echo "                             (DEF=\"\" for \"/bin/bash\")"
     echo "  (-c|-command)STRING      command to run"
     echo "                             (DEF=\"make output.txt\")"
+    echo "  (-m|-make)STRING         command to use for \"make\""
+    echo "                             (DEF=\"make\")"
     echo
     echo "and where STRING follows a whitespace-delimited format"
     echo "such as:"
@@ -40,7 +43,7 @@
 	    exit 1
 	fi
 	echo -n "building mpack...  "
-	( cd $MPACKDIR && ./configure && make ) > build_mpack.out 2>&1
+	( cd $MPACKDIR && ./configure && $MAKE ) > build_mpack.out 2>&1
 	RETVAL=$?
 	if test "x$RETVAL" != x0 ; then
 	    echo
@@ -204,7 +207,7 @@
 	fi
 	printf 'make CLEAN ... ' 2>&1
 	if test -r Makefile ; then
-	    make CLEAN >> make.log 2>&1
+	    $MAKE CLEAN >> make.log 2>&1
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
 		tail make.log
@@ -224,7 +227,7 @@
     (
 	cd $1;
 	printf 'make depend ... ' 1>&2
-	make depend >> make.log 2>&1
+	$MAKE depend >> make.log 2>&1
 	RETVAL=$?
 	if test "x$RETVAL" != x0 ; then
 	    tail make.log
@@ -244,7 +247,7 @@
 	cd $1;
 	if test -r Makefile ; then
 	    printf 'make ... ' 1>&2
-	    make >> make.log 2>&1
+	    $MAKE >> make.log 2>&1
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
 		tail make.log
@@ -405,6 +408,8 @@
 MPACKDIR="../tools/mpack-1.6"
 MPACK="$MPACKDIR/mpack"
 COMMAND="make output.txt"
+MAKE=make
+MPI=f
 
 echo -n "parsing options...  "
 
@@ -450,6 +455,12 @@
 	-command=* | --command=*)
 	    COMMAND=$ac_optarg ;;
 
+	-make | --make | -m | --m)
+	    ac_prev=MAKE ;;
+	-make=* | --make=*)
+	    MAKE=$ac_optarg ;;
+
+	-mpi) MPI=t ;;
 	-verbose) verbose=2 ;;
 	-debug) debug=1 ;;
 	-clean) clean=1 ;;
@@ -534,7 +545,27 @@
 		| tee -a $SUMMARY
 	    continue
 	fi
-	
+
+	#  Is this an MPI run?
+	if test "x$MPI" = xt ; then
+	    if test ! -r $dir"/code/CPP_EEOPTIONS.h_mpi" -o ! -r $dir"/code/SIZE.h_mpi" ; then
+		echo | tee -a $SUMMARY
+		echo "can't read \"$dir/code/CPP_EEOPTIONS.h_mpi\" or \"$dir/code/SIZE.h_mpi\"" \
+		    | tee -a $SUMMARY
+		continue
+	    else
+		cp $dir"/code/CPP_EEOPTIONS.h_mpi" $dir"/code/CPP_EEOPTIONS.h"
+		cp $dir"/code/SIZE.h_mpi" $dir"/code/SIZE.h"
+	    fi
+	else
+	    if test -r $dir"/code/CPP_EEOPTIONS.h_nompi" ; then
+		cp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h"
+	    fi
+            if test -r $dir"/code/SIZE.h_nompi" ; then
+                cp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h"
+            fi
+	fi
+
 	#  Create an output dir for each OPTFILE/tdir combination
 	CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR
 	mkdir $CDIR