--- MITgcm/verification/testreport	2013/04/04 14:32:31	1.181
+++ MITgcm/verification/testreport	2013/07/07 00:33:19	1.185
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.181 2013/04/04 14:32:31 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.185 2013/07/07 00:33:19 jmc Exp $
 #  $Name:  $
 #
 
@@ -322,9 +322,12 @@
 	'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $refoutp ; yy=$? ;;
 	'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $refoutp ; yy=$? ;;
 	'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $refoutp ; yy=$? ;;
-	'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Global"	  $2 $refoutp ; yy=$? ;;
-	'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South"	  $2 $refoutp ; yy=$? ;;
-	'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North"	  $2 $refoutp ; yy=$? ;;
+	'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Glob-ave"  $2 $refoutp ; yy=$? ;;
+	'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South-av"  $2 $refoutp ; yy=$? ;;
+	'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North-av"  $2 $refoutp ; yy=$? ;;
+	'HthMxS') testoutput_var $1 "thSI_IceH_max_S" "thSIc H South-max" $2 $refoutp ; yy=$? ;;
+	'HthMxN') testoutput_var $1 "thSI_IceH_max_N" "thSIc H North-max" $2 $refoutp ; yy=$? ;;
+	'StrmIc') testoutput_var $1 "STREAMICE_FP_ERR" "StreamIce Solver" $2 $refoutp ; yy=$? ;;
 	      *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
 	  esac
 	  if test $xx = $sVar
@@ -467,6 +470,7 @@
 	    rm -f $RUNLOG *.txt STD* w2_tile_topology.????.log *diagnostics.log datetime
 	    rm -rf mnc_test_*
 	    rm -f *_MIT_CE_000.opt0000 costfunction*0000
+	    rm -f oad_cp.000.[0-9][0-9][0-9][0-9][0-9]
 	    echo successful
 	    exit 0
 	)
@@ -1513,14 +1517,13 @@
     #  Check whether there are "extra runs" for this testdir
     extra_runs=
     if test "x$NORUN" = xf ; then
-	ex_run_dirs=`( cd $dir ; echo $inputdir.* )`
+	ex_run_dirs=`( cd $dir ; ls -d $inputdir.* 2> /dev/null )`
     fi
     #echo "ex_run_dirs='$ex_run_dirs'"
     for exd in $ex_run_dirs ; do
 	name=`echo $exd | sed -e "s/$inputdir\.//"`
 	refExOut=`echo $ref_outp | sed "s/\./.${name}./"`
 	outf="$dir/results/$refExOut"
-	#if test -f $outf -a -r $outf ; then
 	if test -r $outf -o -r ${outf}.gz ; then
 	  if test "x$MULTI_THREAD" = "xt" ; then
 	    if test -r $dir"/"$exd"/eedata.mth" ; then