--- MITgcm/verification/testreport	2005/02/04 14:43:20	1.65
+++ MITgcm/verification/testreport	2005/08/16 17:12:46	1.71
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.65 2005/02/04 14:43:20 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.71 2005/08/16 17:12:46 jmc Exp $
 #  $Name:  $
 #
 
@@ -27,6 +27,8 @@
     echo "                             (DEF=\"make output.txt\")"
     echo "  (-m|-make) STRING        command to use for \"make\""
     echo "                             (DEF=\"make\")"
+    echo "  (-odir) STRING           used to build output directory name"
+    echo "                             (DEF=\"hostname\")"
     echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"
     echo "                             (DEF=\"1 2 3 4 5\")"
     echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
@@ -95,8 +97,8 @@
     fi
     if [ -r $1/$4/output.txt ]; then
 	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
+	lncntA=`wc -l tmp1.txt | awk '{print $1}' `
+	if [ $lncntA -lt 3 ]; then
 	    if [ $verbose -gt 0 ]; then
 		echo Not enough lines of output when searching for "$2" 1>&2
 	    fi
@@ -110,13 +112,24 @@
 	echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2
     fi
     grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt
-    lncnt=`wc -l tmp2.txt | awk '{print $1}' `
-    if [ $lncnt -lt 3 ]; then
+    lncntB=`wc -l tmp2.txt | awk '{print $1}' `
+    if [ $lncntB -lt 3 ]; then
 	if [ $verbose -gt 0 ]; then
 	    echo Not enough lines of output when searching for "$2" 1>&2
 	fi
 	return 99
     fi
+    if [ $lncntA -ne $lncntB ]; then
+        if [ $verbose -gt 0 ]; then
+            echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2
+        fi
+        return 99
+    fi
+    non_real_numb=`egrep -c -i 'NAN|INF' tmp1.txt`
+    if [ $non_real_numb -gt 0 ]; then
+	echo testoutput_for_prop: output.txt has $non_real_numb not real numbers 1>&2
+	return 99
+    fi
     if [ $debug -gt 0 ]; then
 	echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2
     fi
@@ -294,6 +307,9 @@
 	    if test "x$IEEE" != x ; then
 		command="$command -ieee"
 	    fi
+	    if test "x$MPI" = xt ; then
+		command="$command -mpi"
+	    fi
 	    printf 'genmake ... ' 1>&2
 	    $command > make.log 2>&1
 	    RETVAL=$?
@@ -339,6 +355,20 @@
     fi
 }
 
+postclean()
+{
+    # postclean directory
+    if test "x$POSTCLEAN" = xt ; then
+	(
+	    cd $1;
+	    if test -r Makefile ; then
+		$MAKE CLEAN >> /dev/null 2>&1
+	    fi
+	    exit 0
+	)
+    fi
+}
+
 makedependmodel()
 {
     # makedependmodel directory
@@ -627,6 +657,7 @@
 NOGENMAKE=f
 NOCLEAN=f
 NODEPEND=f
+POSTCLEAN=f
 
 BASH=
 OPTFILE=NONE
@@ -644,6 +675,7 @@
 fi
 JOBS=
 MPI=f
+OUTDIR=
 DELDIR=
 
 ADM=
@@ -700,6 +732,11 @@
 	-make=* | --make=*)
 	    MAKE=$ac_optarg ;;
 
+        -odir | --odir)
+            ac_prev=OUTDIR ;;
+        -odir=* | --odir=*)
+            OUTDIR=$ac_optarg ;;
+
 	-ptracers | --ptracers | -ptr | --ptr)
 	    ac_prev=PTRACERS_NUM ;;
 	-ptracers=* | --ptracers=* | -ptr=* | --ptr=*)
@@ -709,7 +746,7 @@
 	-j=*) JOBS=$ac_optarg ;;
 
 	-clean | --clean)
-	    CLEANUP=t ;;
+	    CLEANUP=t ; DELDIR=t ;;
 
 	-quick | --quick | -q | --q)
 	    QUICK=t ;;
@@ -720,6 +757,9 @@
 	-nodepend | --nodepend | -nd | --nd)
 	    NODEPEND=t ;;
 
+	-postclean | --postclean | -pc | --pc)
+	    POSTCLEAN=t ;;
+
 	-mpi) MPI=t ;;
 
 	-adm | -ad) ADM=t ;;
@@ -786,6 +826,9 @@
 UNAMEA=`uname -a`
 DATE=`date +%Y%m%d`
 BASE="tr_"$MACH"_"$DATE"_"
+if test "x$OUTDIR" != x ; then
+    BASE="tr_"$OUTDIR"_"$DATE"_"
+fi
 DNUM=0
 DRESULTS="$BASE$DNUM"
 while test -e $DRESULTS ; do
@@ -1031,6 +1074,8 @@
 	echo "DATE='$DATE'" >> $CDIR"/summary.txt"
 	echo "tdir='$dir'" >> $CDIR"/summary.txt"
     fi
+
+    postclean $dir/$builddir
     
     echo "-------------------------------------------------------------------------------"