--- MITgcm/verification/testreport	2004/12/11 02:48:45	1.59
+++ MITgcm/verification/testreport	2005/01/26 00:24:06	1.63
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.59 2004/12/11 02:48:45 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.63 2005/01/26 00:24:06 jmc Exp $
 #  $Name:  $
 #
 
@@ -450,7 +450,7 @@
 	    if test "x$ADM" = x ; then
 		files=`( cd ../input ; ls -1 | grep -v CVS )`
 		for i in $files ; do
-		    if test ! -d "../input/"$i ; then
+		    if test ! -d "../input/"$i -a ! -f $i ; then
 			ln -sf "../input/"$i $i
 		    fi
 		done
@@ -529,7 +529,7 @@
     abave = 0.5*(fabs(a)+fabs(b));
     if (abave > 0.0) {
       relerr=fabs(a-b)/abave;
-      if (relerr > 0.0) { linnum = (int)log10(relerr); }
+      if (relerr > 0.0) { linnum = (int)lrint(log10(relerr)); }
       else { linnum = -16 ; }
       best = (best > linnum) ? best : linnum;
     }
@@ -875,6 +875,10 @@
 	if test -r $dir/input/Makefile ; then
 	    ( cd $dir/input ; make CLEAN )
 	fi
+	(
+	    cd $dir
+	    rm -rf tr_run.*
+	)
 	continue
     fi
 
@@ -971,24 +975,38 @@
 	echo "tdir='$dir'" >> $CDIR"/summary.txt"
 
 	for ex in $extra_runs ; do
-	    test -e "$dir/tr_run.$ex" && rm -rf "$dir/tr_run.$ex"
-	    mkdir "$dir/tr_run.$ex"
-	    links=`( cd "$dir/input" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
+	    test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
+	    for ldir in input.$ex input ; do
+		(
+		    cd "$dir/$ldir" > /dev/null 2>&1
+		    ls -1 2>/dev/null \
+			| sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'
+		) > tr_exrun_links
+		(
+		    cd "$dir/tr_run.$ex"
+		    cat ../../tr_exrun_links | while read i ; do
+			if test ! "x$i" = x ; then
+			    test ! -r $i  &&  ln -s "../"$ldir"/"$i $i
+			fi
+		    done
+		)
+		test -e tr_exrun_links  &&  rm -f tr_exrun_links
+	    done
+	    ldir=build
+	    (
+		cd "$dir/$ldir" > /dev/null 2>&1
+		ls -1 Makefile *.[fFhco] mitgcmuv  2>/dev/null \
+		    | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'
+	    ) > tr_exrun_links
 	    (
 		cd "$dir/tr_run.$ex"
-		for i in $links; do
-		    ln -s ../input/$i $i
-		done
-	    )
-	    links=`( cd "$dir/input.$ex" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
-	    ( 
-		cd "$dir/tr_run.$ex"
-		for i in $links; do
-		    test -e $i  &&  rm -f $i
-		    ln -s ../input.$ex/$i $i
-		done
-		ln -s ../$builddir/mitgcmuv mitgcmuv
+		    cat ../../tr_exrun_links | while read i ; do
+			if test ! "x$i" = x ; then
+			    test ! -r $i  &&  ln -s "../"$ldir"/"$i $i
+			fi
+		    done
 	    )
+	    test -e tr_exrun_links  &&  rm -f tr_exrun_links
 	    runmodel $dir/tr_run.$ex && run=Y \
 		&& results=`testoutput $dir tr_run.$ex "."$ex`
 	    fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`