--- MITgcm/verification/testreport	2004/11/29 21:38:08	1.51
+++ MITgcm/verification/testreport	2004/12/09 15:52:33	1.55
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.51 2004/11/29 21:38:08 mlosch Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.55 2004/12/09 15:52:33 edhill Exp $
 #  $Name:  $
 #
 
@@ -519,23 +519,23 @@
 #include <math.h>
 int main( int argc, char** argv )  {
   int linnum,best,lncnt;
-  double a,b,diff;
+  double a,b,abave,relerr;
   best = -16;
   lncnt = 0;
   while( 1 & (lncnt+=1) < 999 )  {
     scanf("%d", &linnum);
     if (linnum == -1)  break;
     scanf("%lf", &a);  scanf("%lf", &b);
-    diff = 0.5*(fabs(a)+fabs(b));
-    if (diff > 0.0) {
-      diff=fabs(a-b)/diff;
-      if (diff > 1.e-12) {
-        linnum = (int)log10(diff);
+    abave = 0.5*(fabs(a)+fabs(b));
+    if (abave > 0.0) {
+      relerr=fabs(a-b)/abave;
+      if (relerr > 0.0) {
+        linnum = (int)log10(relerr);
         best = (best > linnum) ? best : linnum;
       }
-      else {
-        if (best == -16 && diff != 0)  best = -22;
-      }
+    }
+    else {
+      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
 
@@ -967,7 +969,7 @@
 	echo "tdir='$dir'" >> $CDIR"/summary.txt"
 
 	OLD_COMMAND=$COMMAND
-	COMMAND="./mitgcmuv > output.txt"
+	# 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"