--- MITgcm/verification/testreport 2004/12/01 16:59:42 1.52 +++ MITgcm/verification/testreport 2004/12/09 16:41:41 1.56 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.52 2004/12/01 16:59:42 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.56 2004/12/09 16:41:41 edhill Exp $ # $Name: $ # @@ -535,7 +535,7 @@ } } else { - if (best == -16 && abave != 0) best = -22; + if (best == -16) best = -22; } } if (lncnt == 999) best=-29; @@ -881,7 +881,6 @@ fout= if test "x$ADM" = x ; then fout=$dir"/results/output.txt" - check_for_add_mon_output $fout else fout=$dir"/results_ad/output.txt_adm" fi @@ -889,6 +888,9 @@ echo "can't read \"$fout\" -- skipping $dir" continue fi + if test "x$ADM" = x ; then + check_for_add_mon_output $fout + fi # Check for additional types of monitor output @@ -966,8 +968,6 @@ echo "DATE='$DATE'" >> $CDIR"/summary.txt" echo "tdir='$dir'" >> $CDIR"/summary.txt" - OLD_COMMAND=$COMMAND - COMMAND="./mitgcmuv > output.txt" for ex in $extra_runs ; do test -e "$dir/tr_run.$ex" && rm -rf "$dir/tr_run.$ex" mkdir "$dir/tr_run.$ex" @@ -1000,7 +1000,6 @@ echo "DATE='$DATE'" >> $CDIR"/summary.txt" echo "tdir='$dir'" >> $CDIR"/summary.txt" done - COMMAND=$OLD_COMMAND else fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}` fres=$fres"$results $dir"