--- MITgcm/verification/testreport	2003/10/09 04:19:20	1.10
+++ MITgcm/verification/testreport	2003/11/26 15:04:42	1.20
@@ -1,6 +1,7 @@
-#!/bin/bash
+#! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.10 2003/10/09 04:19:20 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.20 2003/11/26 15:04:42 edhill Exp $
+#  $Name:  $
 #
 
 usage()
@@ -12,16 +13,18 @@
     echo "  (-help|-h)               print usage"
     echo "  (-mpi)                   use MPI input files"
     echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
+    echo "                             (DEF=\"noieee\")"
     echo "  (-optfile=|-of=)STRING   list of optfiles to use"
-    echo "  (-a|-addr)STRING         list of email recipients"
+    echo "  (-a|-addr) STRING        list of email recipients"
     echo "                             (DEF=\"edhill@mitgcm.org\")"
-    echo "  (-t|-tdir)STRING         list of test dirs to use"
+    echo "  (-t|-tdir) STRING        list of test dirs to use"
     echo "                             (DEF=\"\" which builds all)"
-    echo "  (-b|-bash)STRING         location of \"bash\" executable"
-    echo "                             (DEF=\"\" for \"/bin/bash\")"
-    echo "  (-command)STRING         command to run"
+    echo "  (-b|-bash) STRING        preferred location of a \"bash\" or"
+    echo "                             Bourne-compatible \"sh\" shell"
+    echo "                             (DEF=\"\" for \"bash\")"
+    echo "  (-command) STRING        command to run"
     echo "                             (DEF=\"make output.txt\")"
-    echo "  (-m|-make)STRING         command to use for \"make\""
+    echo "  (-m|-make) STRING        command to use for \"make\""
     echo "                             (DEF=\"make\")"
     echo "  (-clean)                 *ONLY* run \"make CLEAN\""
     echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
@@ -43,10 +46,12 @@
     echo -n "building the mpack utility...  "
     if test ! -x "$MPACKDIR/mpack" ; then
 	if test ! -d $MPACKDIR ; then
+	    echo
 	    echo "Error: can't find \"$MPACKDIR\""
 	    echo "  are you sure this program is being run in the correct "
 	    echo "  (that is, \"MITGCM_ROOT\verification\") directory?"
-	    exit 1
+	    echo
+	    HAVE_MPACK=f
 	fi
 	echo -n "building mpack...  "
 	( cd $MPACKDIR && ./configure && $MAKE ) > build_mpack.out 2>&1
@@ -54,8 +59,13 @@
 	if test "x$RETVAL" != x0 ; then
 	    echo
 	    echo "Error building the mpack tools at: $MPACK_DIR"
-	    exit 1
+	    echo
+	    HAVE_MPACK=f
+	else
+	    HAVE_MPACK=t
 	fi
+    else
+	HAVE_MPACK=t
     fi
     echo "OK"
 }
@@ -80,7 +90,7 @@
 	echo testoutput_for_prop: grep "$2" $1/$4/output.txt 1>&2
     fi
     if [ -r $1/$4/output.txt ]; then
-	grep "$2" $1/$4/output.txt | sed 's/.*=//' | nl > tmp1.txt
+	grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
 	lncnt=`wc -l tmp1.txt | awk '{print $1}' `
 	if [ $lncnt -lt 3 ]; then
 	    if [ $verbose -gt 0 ]; then
@@ -95,7 +105,7 @@
     if [ $debug -gt 0 ]; then
 	echo testoutput_for_prop: grep "$2" $1/results/output.txt 1>&2
     fi
-    grep "$2" $1/results/output.txt | sed 's/.*=//' | nl > tmp2.txt
+    grep "$2" $1/results/output.txt | sed 's/.*=//' | cat -n > tmp2.txt
     lncnt=`wc -l tmp2.txt | awk '{print $1}' `
     if [ $lncnt -lt 3 ]; then
 	if [ $verbose -gt 0 ]; then
@@ -155,7 +165,6 @@
     if [ $debug -gt 0 ]; then
 	echo testoutput: cg2dres=$cg2dres 1>&2
     fi
-    
     testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?
     testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?
     testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?
@@ -209,7 +218,7 @@
 		cp make.log $CDIR
 		return 1
 	    else
-		echo "succesful" 1>&2
+		echo "successful" 1>&2
 	    fi
 	)
     fi
@@ -237,7 +246,7 @@
 		    return 1
 		fi
 	    fi
-	    echo succesful 1>&2
+	    echo successful 1>&2
 	    exit 0
 	)
     fi
@@ -260,7 +269,7 @@
 		cp make.log $CDIR"/make.log"
 		return 1
 	    else
-		echo succesful 1>&2
+		echo successful 1>&2
 	    fi
 	)
     fi
@@ -281,7 +290,7 @@
 		cp make.log $CDIR"/make.log"
 		return 1
 	    else
-		echo succesful 1>&2
+		echo successful 1>&2
 	    fi
 	fi
     )
@@ -292,8 +301,16 @@
     # linkdata flag
     #
     # symbolically link data files to run directory
-    if [ $1 -ne 0 ]; then
-	( cd $2 ;  ln -sf ../input/* . )
+    if test "x$1" = x1 ; then
+	(
+	    cd $2
+	    files=`( cd ../input ; ls -1 | grep -v CVS )`
+	    for i in $files ; do
+		if test ! -d "../input/"$i ; then
+		    ln -sf "../input/"$i $i
+		fi
+	    done
+	)
     fi
 }
 
@@ -305,14 +322,18 @@
     #  (where "$COMMAND" is relative to "directory")
     (
 	cd $1
-	printf 'runmodel: ' 1>&2
+	printf 'runmodel ... ' 1>&2
 	# make output.txt
-	$COMMAND
+	$COMMAND >> run.log 2>&1
 	RETVAL=$?
 	if test "x$RETVAL" = x0 ; then
+	    echo successful 1>&2
 	    cp output.txt $CDIR"/output.txt"
 	    return 0
 	else
+	    tail run.log
+	    echo failed 1>&2
+	    cp run.log $CDIR"/run.log"
 	    return 1
 	fi
     )
@@ -442,6 +463,7 @@
 ADDRESSES=
 TESTDIRS=
 MPACKDIR="../tools/mpack-1.6"
+HAVE_MPACK=
 MPACK="$MPACKDIR/mpack"
 COMMAND="make output.txt"
 MAKE=make
@@ -508,7 +530,7 @@
 	-nodepend | --nodepend | -nd | --nd)
 	    NODEPEND=t ;;
 
-	-mpi) MPI=true ;;
+	-mpi) MPI=t ;;
 
 	-ieee) IEEE=true ;;
 	-noieee) IEEE= ;;
@@ -567,12 +589,14 @@
 mkdir $DRESULTS
 RETVAL=$?
 if test "x$RETVAL" != x0 ; then
-    echo "Error: can't create results directory \"./$DRESULTS\""
+    echo "ERROR: Can't create results directory \"./$DRESULTS\""
     exit 1
 fi
 SUMMARY="$DRESULTS/summary.txt"
-date > $SUMMARY
-cat << EOF >> $SUMMARY
+echo -n "Start time:  " >> $SUMMARY
+start_date=`date`
+echo $start_date > $SUMMARY
+cat << EOF | tee -a $SUMMARY
                 T           S           U           V
 G D M    c        m  s        m  s        m  s        m  s
 E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .
@@ -583,9 +607,21 @@
 
 NDIR=0
 
+of_path=
 if test "x$OPTFILE" != xNONE ; then
     if test -r $OPTFILE ; then
-	OPTFILE=`pwd`"/$OPTFILE"
+	# get the path
+	path=${OPTFILE%/*}
+	if test "x$path" = x ; then
+	    of_path=`pwd`
+	else
+	    of_path=`( cd $path > /dev/null 2>&1 ; pwd )`
+	fi
+	file=${OPTFILE##*/}
+	OPTFILE=$of_path/$file
+    else
+	echo
+	echo "WARNING: can't read OPTFILE=\"$OPTFILE\" but will try to use it..."
     fi
 fi
 echo
@@ -620,15 +656,14 @@
     unset genmake makedepend make run
     results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
 
-    if [ -r $dir/build ]; then
-	seperatebuilddir=1
-	builddir=build
-	rundir=build
-	( cd $dir/build; ln -sf ../input/* . )
-    else
-	seperatebuilddir=0
-	builddir=input
-	rundir=input
+    builddir="input"
+    rundir="input"
+    use_seperate_build=0
+    if test -d $dir/build -a -r $dir/build ; then
+	builddir="build"
+	rundir="build"
+	use_seperate_build=1
+	linkdata $use_seperate_build $dir/$rundir
     fi
     
     CODE_DIR=$dir/code
@@ -672,9 +707,9 @@
     fi
     
     #  Create an output dir for each OPTFILE/tdir combination
-    CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR
-    mkdir $CDIR
-    CDIR=`pwd`"/$CDIR"
+    rel_CDIR=$DRESULTS"/"$dir
+    mkdir $rel_CDIR
+    CDIR=`pwd`"/$rel_CDIR"
     
     if test "x$CLEANUP" = xt ; then
 	makeclean $dir/$builddir
@@ -683,8 +718,8 @@
 	    && makeclean $dir/$builddir \
 	    && makedependmodel $dir/$builddir && makedepend=Y \
 	    && makemodel $dir/$builddir && make=Y \
-	    && linkdata $seperatebuilddir $dir/$rundir \
-	    && runmodel $dir/$builddir && run=Y \
+	    && linkdata $use_seperate_build $dir/$rundir \
+	    && runmodel $dir/$rundir && run=Y \
 	    && results=`testoutput $dir $rundir`
     fi
     
@@ -703,31 +738,51 @@
     echo "DATE='$DATE'" >> $CDIR"/summary.txt"
     echo "tdir='$dir'" >> $CDIR"/summary.txt"
     
-    (
-	cd $DRESULTS
-	tar -cf $NDIR".tar" $DRESULTS"_"$NDIR > /dev/null 2>&1
-	gzip $NDIR".tar"
-    )
+    echo "-------------------------------------------------------------------------------"
     
-    if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
-	echo "No mail sent"
-    else
-	$MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES
+    NDIR=$(( $NDIR + 1 ))
+    
+done
+
+echo -n "Start time:  " >> $SUMMARY
+echo $start_date >> $SUMMARY
+echo -n "End time:    " >> $SUMMARY
+date >> $SUMMARY
+
+#  If addresses were supplied and mpack built successfully, then try
+#  to send email using mpack.
+if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
+    echo "No results email was sent."
+else
+    if test "x$HAVE_MPACK" = xt ; then
+	tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \
+	    && gzip $DRESULTS".tar" \
+	    && $MPACK -s MITgcm-test -m 1500000 $DRESULTS".tar.gz" $ADDRESSES
 	RETVAL=$?
 	if test "x$RETVAL" != x0 ; then
-	    echo "Warning: \"$MPACK\" failed -- please contact <edhill@mitgcm.org>"
+	    echo
+	    echo "Warning: The tar, gzip, & mpack step failed.  Please send email"
+	    echo "  to <MITgcm-support@mitgcm.org> for help.  You may copy the "
+	    echo "  summary of results from the directory \"$DRESULTS\"."
+	    echo
 	else
-	    rm -f $DRESULTS"/"$NDIR".tar*"
+	    echo
+	    echo "An email containing results was sent to the following addresses:"
+	    echo "  \"$ADDRESSES\""
+	    echo
 	fi
+	test -f $DRESULTS".tar"  &&  rm -f $DRESULTS".tar"
+	test -f $DRESULTS".tar.gz"  &&  rm -f $DRESULTS".tar.gz"
     fi
-
-    echo "-------------------------------------------------------------------------------"
-    
-    NDIR=$(( $NDIR + 1 ))
-    
-done
+fi
 
 rm tmp_cmpnum.f a.out
 
-cat $SUMMARY
+if test "x$CLEANUP" != xt ; then
+    cat $SUMMARY
+    if test -e tr.out ; then
+        mv tr.out tr.out.old
+    fi
+    cat $SUMMARY > tr.out
+fi