--- MITgcm/verification/testreport	2004/07/06 20:14:32	1.41
+++ MITgcm/verification/testreport	2004/07/08 20:58:24	1.43
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.41 2004/07/06 20:14:32 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.43 2004/07/08 20:58:24 edhill Exp $
 #  $Name:  $
 #
 
@@ -27,6 +27,7 @@
     echo "                             (DEF=\"make output.txt\")"
     echo "  (-m|-make) STRING        command to use for \"make\""
     echo "                             (DEF=\"make\")"
+    echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
     echo "  (-clean)                 *ONLY* run \"make CLEAN\""
     echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
     echo "  (-nogenmake|-ng)         skip the genmake stage"
@@ -307,7 +308,11 @@
 	if test -r Makefile ; then
 	    printf 'make ... ' 1>&2
 	    if test "x$ADM" = x ; then
-		$MAKE >> make.log 2>&1
+		if test "x$JOBS" = x ; then
+		    $MAKE >> make.log 2>&1
+		else
+		    $MAKE -j $JOBS >> make.log 2>&1
+		fi
 	    else
 		$MAKE adall >> make.log 2>&1
 	    fi
@@ -567,6 +572,7 @@
 MPACK="$MPACKDIR/mpack"
 COMMAND=
 MAKE=make
+JOBS=
 MPI=f
 DELDIR=
 
@@ -621,6 +627,9 @@
 	-make=* | --make=*)
 	    MAKE=$ac_optarg ;;
 
+	-j) ac_prev=JOBS ;;
+	-j=*) JOBS=$ac_optarg ;;
+
 	-clean | --clean)
 	    CLEANUP=t ;;
 
@@ -868,26 +877,26 @@
 	OLD_COMMAND=$COMMAND
 	COMMAND="./mitgcmuv > output.txt"
 	for ex in $extra_runs ; do
-	    test -e "$dir/tr_run" && rm -rf "$dir/tr_run"
-	    mkdir "$dir/tr_run"
+	    test -e "$dir/tr_run.$ex" && rm -rf "$dir/tr_run.$ex"
+	    mkdir "$dir/tr_run.$ex"
 	    links=`( cd "$dir/input" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
 	    (
-		cd "$dir/tr_run"
+		cd "$dir/tr_run.$ex"
 		for i in $links; do
 		    ln -s ../input/$i $i
 		done
 	    )
 	    links=`( cd "$dir/input.$ex" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
 	    ( 
-		cd "$dir/tr_run"
+		cd "$dir/tr_run.$ex"
 		for i in $links; do
 		    test -e $i  &&  rm -f $i
 		    ln -s ../input.$ex/$i $i
 		done
 		ln -s ../$builddir/mitgcmuv mitgcmuv
 	    )
-	    runmodel $dir/tr_run && run=Y \
-		&& results=`testoutput $dir tr_run "."$ex`
+	    runmodel $dir/tr_run.$ex && run=Y \
+		&& results=`testoutput $dir tr_run.$ex "."$ex`
 	    fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
 	    fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
 	    fres="$fres.$ex"