--- MITgcm/verification/testreport	2010/06/23 18:46:43	1.141
+++ MITgcm/verification/testreport	2010/11/02 00:55:40	1.145
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.141 2010/06/23 18:46:43 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.145 2010/11/02 00:55:40 jmc Exp $
 #  $Name:  $
 #
 
@@ -358,14 +358,14 @@
 	    fi
 	    fi
 	    printf 'genmake ... '
-	    eval $command > make.log 2>&1
+	    eval $command > genmake.log 2>&1
 	    RETVAL=$?
 	    #  Reduce the size of the testing emails!
 	    head -100 Makefile > $CDIR/Makefile_head
 	    if test "x$RETVAL" != x0 ; then
-		tail make.log
+		tail genmake.log
 		echo "genmakemodel: genmake failed"
-		cp genmake_* make.log $CDIR
+		cp genmake_* genmake.log $CDIR
 		return 1
 	    else
 		echo "successful"
@@ -377,6 +377,7 @@
 makeclean()
 {
     # makeclean directory
+    if test "x$NODEPEND" = xf ; then rm -f $1/make.log ; fi
     if test "x$NOCLEAN" = xt ; then
 	echo "make Clean skipped!"
     else
@@ -385,6 +386,7 @@
 	    #if test -e $OUTPUTFILE ; then rm -f $OUTPUTFILE ; fi
 	    if test -r Makefile ; then
 		printf 'clean build-dir: make Clean ... '
+		rm -f Makefile.old
 		$MAKE Clean >> make.log 2>&1
 		RETVAL=$?
 		if test "x$RETVAL" != x0 ; then
@@ -416,7 +418,7 @@
 	    find . -name "*.data" -exec rm {} \;
 	    find . -name "fort.*" -exec rm {} \;
 	    find . -type l -exec rm {} \;
-	    rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime
+	    rm -f $EXECUTABLE $RUNLOG *.txt STD* *diagnostics.log datetime
 	    rm -rf mnc_test_*
  	    rm -f *_MIT_CE_000.opt0000 costfunction*0000
 	    echo successful
@@ -1015,8 +1017,12 @@
     EXECUTABLE="mitgcmuv"
 fi
 
+xx=`echo $TESTDIRS | awk '{print $1}'`
 if test "x$TESTDIRS" = x ; then
     LIST=`scandirs results/$ref_outp`
+elif test $xx = 'start_from' ; then
+    xx=`echo $TESTDIRS | awk '{print $2}'`
+    LIST=`scandirs results/$ref_outp | sed -n "/$xx/,$ p"`
 else
     #- expand group of experiments:
     LIST=" "
@@ -1209,6 +1215,7 @@
     builddir="build"
     if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
     rundir="run"
+    pfxdir="tr_$rundir"
     if test ! -d $dir/$rundir ; then
 	rundir=$builddir
     fi
@@ -1219,12 +1226,16 @@
     if test "x$CLEANUP" = xt ; then
 	echo -n '  --- dir:' $BUILD_DIR ': '
 	makeclean $BUILD_DIR
-        rm -f $BUILD_DIR/$EXECUTABLE
+	(   cd $BUILD_DIR
+	    rm -f $EXECUTABLE *.bak
+	    rm -f genmake_state genmake_*optfile genmake_warnings genmake_errors
+	    rm -f genmake.log make.log
+	)
 	if test -d $dir/$rundir/CVS ; then
             echo -n '  --- dir:' $dir/$rundir ': '
 	    run_clean $dir/$rundir
 	fi
-	trdir=`( cd $dir ; find . -type d -name "tr_run.*" -print | sed 's/^.\///')`
+	trdir=`( cd $dir ; find . -type d -name "$pfxdir.*" -print | sed 's/^.\///')`
 	ttd=`echo $trdir | wc -w`
 	if test $ttd != 0 ; then
 	    echo '  --- rm dir:' $trdir
@@ -1349,11 +1360,11 @@
 	    locDIR=$DRESULTS"/"$dir"."$ex
 	    mkdir $locDIR
 	    CDIR=`pwd`"/$locDIR"
-	    test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
-	    run_clean $dir/tr_run.$ex
-	    linkdata $dir/tr_run.$ex $inputdir.$ex $inputdir
-	    runmodel $dir/tr_run.$ex && run=Y \
-	    && results=`testoutput_run $dir tr_run.$ex $refExOut`
+	    test ! -e "$dir/$pfxdir.$ex" && mkdir "$dir/$pfxdir.$ex"
+	    run_clean $dir/$pfxdir.$ex
+	    linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir
+	    runmodel $dir/$pfxdir.$ex && run=Y \
+	    && results=`testoutput_run $dir $pfxdir.$ex $refExOut`
 	    fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
 	    fres="$fres.$ex"
 	    echo 1>&2
@@ -1366,11 +1377,11 @@
 	    echo "tdir='$dir.$ex'" >> $locDIR"/summary.txt"
             if test "x$ADM" = xt ; then
 	        head -1 $dir/$builddir/taf_ad.log >> $locDIR"/summary.txt"
-	        grep -A3 'Seconds in section "ALL' $dir/tr_run.$ex/$OUTPUTFILE \
+	        grep -A3 'Seconds in section "ALL' $dir/$pfxdir.$ex/$OUTPUTFILE \
 			           >> $locDIR"/summary.txt"
             fi
 	    if test "x$POSTCLEAN" = xt ; then
-		run_clean $dir/tr_run.$ex
+		run_clean $dir/$pfxdir.$ex
 	    fi
 	done