--- MITgcm/verification/testreport	2012/08/18 19:01:54	1.178
+++ MITgcm/verification/testreport	2013/06/05 17:44:31	1.183
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.178 2012/08/18 19:01:54 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.183 2013/06/05 17:44:31 jmc Exp $
 #  $Name:  $
 #
 
@@ -322,9 +322,11 @@
 	'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=$? ;;
 	      *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
 	  esac
 	  if test $xx = $sVar
@@ -1296,8 +1298,12 @@
 #  Create a uniquely named directory to store results
 CMDLINE=$0
 for xx in "$@" ; do nw=`echo $xx | wc -w`
-    if test $nw = '1' ; then CMDLINE="$CMDLINE $xx"
-                        else CMDLINE="$CMDLINE '$xx'" ; fi
+    if test $nw = '1' ; then CMDLINE="$CMDLINE $xx" ; else
+      nb=`echo $xx | grep -c '='`
+      if test $nb = 0 ; then CMDLINE="$CMDLINE '$xx'"
+      else yy=`echo "$xx'" | sed "s/=/='/"` ;
+			     CMDLINE="$CMDLINE $yy" ; fi
+    fi
 done
 #for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done
 MACH=`hostname`
@@ -1344,8 +1350,8 @@
 	echo >> $SUMMARY
 	echo "  OPTFILE=$OPTFILE" >> $SUMMARY
     else
-	echo | tee $SUMMARY
-	echo "ERROR: can't read OPTFILE=\"$OPTFILE\"" | tee $SUMMARY
+	echo | tee -a $SUMMARY
+	echo "ERROR: can't read OPTFILE=\"$OPTFILE\"" | tee -a $SUMMARY
 	exit 1
     fi
 else
@@ -1372,11 +1378,20 @@
 else
     line_0=`printf '%s %2i' 'default   ' $MATCH_CRIT`
   if test $KIND = 1 ; then
-    echo "TANGLIN=true" >> $SUMMARY
+   #echo "TANGLIN=true" >> $SUMMARY
+    echo "TangLin generated by TAF" >> $SUMMARY
+  elif test $KIND = 3 ; then
+    echo "TangLin generated by OpenAD" >> $SUMMARY
+  elif test $KIND = 2 ; then
+   #echo "ADJOINT=true" >> $SUMMARY
+    echo "Adjoint generated by TAF" >> $SUMMARY
+  else
+    echo "Adjoint generated by OpenAD" >> $SUMMARY
+  fi
+  if test $KIND = 1 -o $KIND = 3 ; then
     line_1="G D M    C  T  F"
     line_2="e p a R  o  L  D"
   else
-    echo "ADJOINT=true" >> $SUMMARY
     line_1="G D M    C  A  F"
     line_2="e p a R  o  d  D"
   fi
@@ -1500,14 +1515,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