--- MITgcm/verification/testreport	2006/07/07 21:47:35	1.84
+++ MITgcm/verification/testreport	2006/08/29 00:18:35	1.88
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.84 2006/07/07 21:47:35 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.88 2006/08/29 00:18:35 jmc Exp $
 #  $Name:  $
 #
 
@@ -91,14 +91,14 @@
 {
     # testoutput_for_prop dir s1 label subdir extension
     #
-    #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt
+    #  compares files $dir/$subdir/$OUTPUTFILE and $dir/results/output.txt
     #  using search strings s1 and text label 
 
     if [ $debug -gt 0 ]; then
-	echo testoutput_for_prop: grep "$2" $1/$4/output.txt 1>&2
+	echo testoutput_for_prop: grep "$2" $1/$4/$OUTPUTFILE 1>&2
     fi
-    if [ -r $1/$4/output.txt ]; then
-	grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
+    if [ -r $1/$4/$OUTPUTFILE ]; then
+	grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt
 	lncntA=`wc -l tmp1.txt | awk '{print $1}' `
 	if [ $lncntA -lt 3 ]; then
 	    if [ $verbose -gt 0 ]; then
@@ -107,13 +107,13 @@
 	    return 99
 	fi
     else
-	echo testoutput_for_prop: output.txt from model run was not readable 1>&2
+	echo testoutput_for_prop: $OUTPUTFILE from model run was not readable 1>&2
 	return 99
     fi
     if [ $debug -gt 0 ]; then
-	echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2
+	echo testoutput_for_prop: grep "$2" $1/results/output.$5 1>&2
     fi
-    grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt
+    grep "$2" $1/results/output.$5 | sed 's/.*=//' | cat -n > tmp2.txt
     lncntB=`wc -l tmp2.txt | awk '{print $1}' `
     if [ $lncntB -lt 3 ]; then
 	if [ $verbose -gt 0 ]; then
@@ -129,12 +129,12 @@
     fi
     has_nan=`cat tmp1.txt | grep -i nan | wc -l`
     if [ $has_nan -gt 0  ] ; then
-	echo testoutput_for_prop: output.txt contains $has_nan NaN values  1>&2
+	echo testoutput_for_prop: $OUTPUTFILE contains $has_nan NaN values  1>&2
 	return 99
     fi
     has_inf=`cat tmp1.txt | grep -i inf | wc -l`
     if [ $has_inf -gt 0  ] ; then
-	echo testoutput_for_prop: output.txt contains $has_inf Inf values  1>&2
+	echo testoutput_for_prop: $OUTPUTFILE contains $has_inf Inf values  1>&2
 	return 99
     fi
     if [ $debug -gt 0 ]; then
@@ -184,9 +184,9 @@
 testoutput_ad()
 {
     grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt
-    grep $3 $1/$2/output_adm.txt | awk '{print NR " " $5}' > t15.txt
+    grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $5}' > t15.txt
     grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt
-    grep $3 $1/$2/output_adm.txt | awk '{print NR " " $6}' > t16.txt
+    grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $6}' > t16.txt
     join t05.txt t15.txt > t5.txt
     join t06.txt t16.txt > t6.txt
     echo "-1" >> t5.txt
@@ -341,7 +341,7 @@
     else
 	(
 	    cd $1;
-	    #if test -e output.txt ; then rm -f output.txt ; fi
+	    #if test -e $OUTPUTFILE ; then rm -f $OUTPUTFILE ; fi
 	    if test -r Makefile ; then
 		printf 'clean build-dir: make Clean ... ' 2>&1
 		$MAKE Clean >> make.log 2>&1
@@ -536,41 +536,48 @@
 	printf 'runmodel in %s ...' $1 1>&2
 	# make output.txt
 	echo
-	rm -f run.log
         if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
-	    echo " link" $EXECUTABLE "from dir ../"$builddir > run.log
+	    echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
 	    ln -sf "../"$builddir"/"$EXECUTABLE .
-	else
-            touch run.log
 	fi
         if test ! -x $EXECUTABLE ; then
+		rm -f run.log ; touch run.log
+		if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
 		echo " no executable:" $EXECUTABLE >> run.log
 		RETVAL=8
+		ENDVAL=-1
 	else
             if test $OUTPUTFILE -ot $EXECUTABLE ; then
+		rm -f run.log ; touch run.log
+		if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
 		( eval $COMMAND ) >> run.log 2>&1
 		RETVAL=$?
 	    else
-     		echo " $OUTPUTFILE is up to date " >> run.log 2>&1
 		RETVAL=0
+		if test -f run.log ; then
+		    if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
+     		    echo "---------->> $OUTPUTFILE is up to date " >> run.log 2>&1
+		else 
+		    touch run.log
+		    if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
+     		    echo "---------->> $OUTPUTFILE is up to date " >> run.log 2>&1
+     		    echo " no previous run.log: assume NORMAL END" >> run.log 2>&1
+		fi
 	    fi
+	    ENDVAL=`cat run.log | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`
 	fi
-	# echo "COMMAND='$COMMAND'"
-	# echo "pwd='"`pwd`"'"
-	if test "x$RETVAL" = x0 ; then
+	rm -f run.log_00
+	#if test "x$RETVAL" = x0 ; then
+	if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
 	    tail run.log
 	    echo successful 1>&2
 	    # === Reduce the size of the testing emails!
-	    # if test "x$ADM" = x ; then
-	    #   cp output.txt $CDIR"/output.txt"
-	    # else
-	    #   cp output_adm.txt $CDIR"/output_adm.txt"
-	    # fi
+	    #cp $OUTPUTFILE $CDIR"/"$OUTPUTFILE
             if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	    return 0
 	else
 	    tail run.log
-	    echo failed 1>&2
+	    echo failed '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2
 	    cp run.log $CDIR"/run.log"
             if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	    return 1
@@ -847,9 +854,9 @@
     for xx in $TESTDIRS
     do
       case $xx in
-	'basic') LIST=${LIST}" aim.5l_cs front_relax global_ocean.90x40x15"
-		 LIST=${LIST}" hs94.128x64x5 tutorial_barotropic_gyre"
-		 LIST=${LIST}" tutorial_global_oce_biogeo tutorial_plume_on_slope"
+	'basic') LIST=${LIST}" aim.5l_cs hs94.128x64x5 ideal_2D_oce"
+		 LIST=${LIST}" lab_sea tutorial_baroclinic_gyre"
+		 LIST=${LIST}" tutorial_global_oce_latlon tutorial_plume_on_slope"
 		;;
 	'tutorials')
 		 LIST=${LIST}" "`ls | grep 'tutorial_'` ;;
@@ -883,13 +890,12 @@
     OUTPUTFILE="output.txt"
 fi
 
-if test "x$ADM" = xt -a "x$COMMAND" = x ; then
-    COMMAND="./$EXECUTABLE > $OUTPUTFILE"
-fi
-
 if test "x$COMMAND" = x ; then
     COMMAND="./$EXECUTABLE > $OUTPUTFILE"
 fi
+if test "x$MPI" = xt ; then
+    OUTPUTFILE="STDOUT.0000"
+fi
 
 #echo "OK"
 echo "OK (COMMAND= $COMMAND )"
@@ -1063,7 +1069,7 @@
 	#echo "ex_run_dirs='$ex_run_dirs'"
 	for exd in $ex_run_dirs ; do
 	    name=`echo $exd | sed -e 's/input.//g'`
-	    outf="$dir/results/output.txt.$name"
+	    outf="$dir/results/output.$name.txt"
             if test -f $outf -a -r $outf ; then
 		if test "x$MULTI_THREAD" = "xt" ; then 
 		    if test -r $dir"/"$exd"/eedata.mth" ; then
@@ -1106,7 +1112,7 @@
 	    && makemodel $dir/$builddir && make=Y \
 	    && linkdata $dir/$rundir $input_dirs \
 	    && runmodel $dir/$rundir && run=Y \
-	    && results=`testoutput $dir $rundir`
+	    && results=`testoutput $dir $rundir "txt"`
     fi
     
     echo
@@ -1131,7 +1137,7 @@
  	    run_clean $dir/tr_run.$ex
             linkdata $dir/tr_run.$ex input.$ex input
 	    runmodel $dir/tr_run.$ex && run=Y \
-		&& results=`testoutput $dir tr_run.$ex "."$ex`
+		&& results=`testoutput $dir tr_run.$ex ${ex}".txt"`
 	    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"