--- MITgcm/verification/testreport 2004/11/24 17:06:07 1.50 +++ MITgcm/verification/testreport 2004/12/07 22:14:35 1.53 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.50 2004/11/24 17:06:07 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.53 2004/12/07 22:14:35 edhill Exp $ # $Name: $ # @@ -519,23 +519,23 @@ #include 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 > 1.e-12) { - diff=fabs(a-b)/diff; - if (diff > 0.0) { - 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 && abave != 0) 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