--- MITgcm/verification/testreport	2004/11/17 21:38:35	1.48
+++ 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.48 2004/11/17 21:38:35 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.55 2004/12/09 15:52:33 edhill Exp $
 #  $Name:  $
 #
 
@@ -27,6 +27,8 @@
     echo "                             (DEF=\"make output.txt\")"
     echo "  (-m|-make) STRING        command to use for \"make\""
     echo "                             (DEF=\"make\")"
+    echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"
+    echo "                             (DEF=\"1 2 3 4 5\")"
     echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
     echo "  (-clean)                 *ONLY* run \"make CLEAN\""
     echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
@@ -35,11 +37,15 @@
     echo "  (-nodepend|-nd)          skip the \"make depend\" stage"
     echo "  (-deldir|-dd)            on success, delete the output directory"
     echo
-    echo "and where STRING follows a whitespace-delimited format"
+    echo "and where STRING can be a whitespace-delimited list"
     echo "such as:"
+    echo
     echo "  -t 'exp0 exp2 exp3' "
     echo "  -addr='abc@123.com testing@home.org'"
     echo
+    echo "provided that the expression is properly quoted within the current"
+    echo "shell (note the use of single quotes to protect white space)."
+    echo
     exit 1
 }
 
@@ -171,6 +177,31 @@
     rm -f t[01][56].txt t[56].txt
 }
 
+check_for_add_mon_output()
+{
+    # Check for additional types of monitor output
+    if test "x$1" = x ; then
+	return
+    fi
+
+    for ii in $PTRACERS_NUM ; do
+	eval "HAVE_PTR0"$ii"=f"
+    done
+
+    ptr_add="trcstat_ptracerXX_min trcstat_ptracerXX_max"
+    ptr_add="$ptr_add trcstat_ptracerXX_mean trcstat_ptracerXX_sd"
+    for ii in $PTRACERS_NUM ; do
+	for jj in $ptr_add ; do
+	    name=`eval "echo $jj | sed -e 's|XX|0"$ii"|g'"`
+	    tst=`grep $name $1 | wc -l | awk '{print $1}'`
+	    if test ! "x$tst" = x0 ; then
+		eval "HAVE_PTR0"$ii"=t"
+	    fi
+	done
+	#  eval 'echo "HAVE_PTR0'$ii' = $HAVE_PTR0'$ii'"'
+    done
+}
+
 testoutput()
 {
     # testoutput directory subdir extension
@@ -200,8 +231,38 @@
 	testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2 $3; vmax=$?
 	testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2 $3; vmean=$?
 	testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2 $3; vsd=$?
-	dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \
-	    $umin $umax $umean $usd $vmin $vmax $vmean $vsd
+
+	#  This is for PTRACERS
+	for ii in $PTRACERS_NUM ; do
+	    eval `echo "p0"$ii"_min=99"`
+	    eval `echo "p0"$ii"_max=99"`
+	    eval `echo "p0"$ii"_mean=99"`
+	    eval `echo "p0"$ii"_sd=99"`
+	    tst=`eval 'echo "$HAVE_PTR0'$ii'"'`
+	    #echo 'tst = '$tst
+	    if test "x$tst" = xt ; then
+		a="trcstat_ptracer0"
+		testoutput_for_prop $1 "$a"$ii"_min"  "p0"$ii"_min"  $2 $3
+		RETVAL=$? ; eval `echo "p0"$ii"_min="$RETVAL`
+		testoutput_for_prop $1 "$a"$ii"_max"  "p0"$ii"_max"  $2 $3
+		RETVAL=$? ; eval `echo "p0"$ii"_max="$RETVAL`
+		testoutput_for_prop $1 "$a"$ii"_mean" "p0"$ii"_mean" $2 $3
+		RETVAL=$? ; eval `echo "p0"$ii"_mean="$RETVAL`
+		testoutput_for_prop $1 "$a"$ii"_sd"   "p0"$ii"_sd"   $2 $3
+		RETVAL=$? ; eval `echo "p0"$ii"_sd="$RETVAL`
+	    fi
+	done
+
+	allargs="$cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd"
+	allargs="$allargs $umin $umax $umean $usd $vmin $vmax $vmean $vsd"
+	allargs="$allargs $p01_min $p01_max $p01_mean $p01_sd"
+	allargs="$allargs $p02_min $p02_max $p02_mean $p02_sd"
+	allargs="$allargs $p03_min $p03_max $p03_mean $p03_sd"
+	allargs="$allargs $p04_min $p04_max $p04_mean $p04_sd"
+	allargs="$allargs $p05_min $p05_max $p05_mean $p05_sd"
+
+	eval "dashnum $allargs"
+
     else
 	testoutput_ad $1 $2 "precision_grdchk_result"
     fi
@@ -458,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 > 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)  best = -22;
     }
   }
   if (lncnt == 999) best=-29;
@@ -585,6 +646,9 @@
 
 ADM=
 
+# Additional monitor types
+PTRACERS_NUM="1 2 3 4 5"
+
 printf "parsing options...  "
 
 ac_prev=
@@ -634,6 +698,11 @@
 	-make=* | --make=*)
 	    MAKE=$ac_optarg ;;
 
+	-ptracers | --ptracers | -ptr | --ptr)
+	    ac_prev=PTRACERS_NUM ;;
+	-ptracers=* | --ptracers=* | -ptr=* | --ptr=*)
+	    PTRACERS_NUM=$ac_optarg ;;
+
 	-j) ac_prev=JOBS ;;
 	-j=*) JOBS=$ac_optarg ;;
 
@@ -760,14 +829,27 @@
 echo
 echo >> $SUMMARY
 if test "x$ADM" = x ; then
-    cat << EOF | tee -a $SUMMARY
-                T           S           U           V
-G D M    c        m  s        m  s        m  s        m  s
-E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .
-N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d
-2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  .
-
-EOF
+    line_0="            ----T-----  ----S-----  ----U-----  ----V-----"
+    line_1="G D M    c        m  s        m  s        m  s        m  s"
+    line_2="E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  ."
+    line_3="N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d"
+    line_4="2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  ."
+    for ii in $PTRACERS_NUM ; do
+	#  tst=`eval 'echo $HAVE_PTR0'$ii`
+	#  if test "x$tst" = xt ; then
+	line_0="$line_0  --PTR 0"$ii"--"
+	line_1="$line_1        m  s"
+	line_2="$line_2  m  m  e  ."
+	line_3="$line_3  i  a  a  d"
+	line_4="$line_4  n  x  n  ."
+	#  fi
+    done
+    echo "$line_0" | tee -a $SUMMARY
+    echo "$line_1" | tee -a $SUMMARY
+    echo "$line_2" | tee -a $SUMMARY
+    echo "$line_3" | tee -a $SUMMARY
+    echo "$line_4" | tee -a $SUMMARY
+    echo " "       | tee -a $SUMMARY
 else
     echo "ADJOINT=true" >> $SUMMARY
     echo >> $SUMMARY
@@ -806,6 +888,11 @@
 	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
 
     builddir="input"
     rundir="input"
@@ -882,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"