--- MITgcm/verification/testreport	2010/06/23 18:46:43	1.141
+++ MITgcm/verification/testreport	2010/11/01 00:25:16	1.144
@@ -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.144 2010/11/01 00:25:16 jmc Exp $
 #  $Name:  $
 #
 
@@ -1015,8 +1015,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 +1213,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
@@ -1220,11 +1225,13 @@
 	echo -n '  --- dir:' $BUILD_DIR ': '
 	makeclean $BUILD_DIR
         rm -f $BUILD_DIR/$EXECUTABLE
+        rm -f $BUILD_DIR/genmake_state $BUILD_DIR/genmake_*optfile
+        rm -f $BUILD_DIR/genmake_warnings $BUILD_DIR/genmake_errors
 	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 +1356,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 +1373,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