--- MITgcm/verification/testreport	2011/09/26 12:58:48	1.167
+++ MITgcm/verification/testreport	2011/12/22 12:55:05	1.170
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.167 2011/09/26 12:58:48 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.170 2011/12/22 12:55:05 mlosch Exp $
 #  $Name:  $
 #
 
@@ -290,6 +290,14 @@
 	 'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Heff max"	  $2 $3; yy=$? ;;
 	 'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Heff mean"  $2 $3; yy=$? ;;
 	 'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Heff StDv"  $2 $3; yy=$? ;;
+	 'uSImn') testoutput_var $1 "seaice_uice_min"   "SIce Uice min"	  $2 $3; yy=$? ;;
+	 'uSImx') testoutput_var $1 "seaice_uice_max"   "SIce Uice max"	  $2 $3; yy=$? ;;
+	 'uSIav') testoutput_var $1 "seaice_uice_mean"  "SIce Uice mean"  $2 $3; yy=$? ;;
+	 'uSIsd') testoutput_var $1 "seaice_uice_sd"    "SIce Uice StDv"  $2 $3; yy=$? ;;
+	 'vSImn') testoutput_var $1 "seaice_vice_min"   "SIce Vice min"	  $2 $3; yy=$? ;;
+	 'vSImx') testoutput_var $1 "seaice_vice_max"   "SIce Vice max"	  $2 $3; yy=$? ;;
+	 'vSIav') testoutput_var $1 "seaice_vice_mean"  "SIce Vice mean"  $2 $3; yy=$? ;;
+	 'vSIsd') testoutput_var $1 "seaice_vice_sd"    "SIce Vice StDv"  $2 $3; yy=$? ;;
 	'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;;
 	'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $3; yy=$? ;;
 	'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $3; yy=$? ;;
@@ -484,17 +492,7 @@
 	cd $1;
 	if test -r Makefile ; then
 	    printf 'make ... '
-	    if test "x$ADM" = xt ; then
-		$MAKE adall >> make.tr_log 2>&1
-	    elif test "x$OADM" = xt ; then
-		$MAKE adAll >> make.tr_log 2>&1
-            else
-		if test "x$JOBS" = x ; then
-		    $MAKE $TARG >> make.tr_log 2>&1
-		else
-		    $MAKE -j $JOBS $TARG >> make.tr_log 2>&1
-		fi
-	    fi
+	    $MAKE $TARG >> make.tr_log 2>&1
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
 		tail make.tr_log
@@ -1115,16 +1113,19 @@
 
 #- setting for forward or ADM testing
 if test "x$ADM" = xt ; then
+    if test "x$TARG" = xobj ; then TARG=adobj ; else TARG=adall ; fi
     code_dir=code_ad
     inputdir=input_ad
     ref_outp="output_adm.txt"
     EXECUTABLE="mitgcmuv_ad"
 elif test "x$OADM" = xt ; then
+    TARG=adAll
     code_dir=code_oad
     inputdir=input_oad
     ref_outp="output_oadm.txt"
     EXECUTABLE="mitgcmuv_ad"
 else
+    if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi
     code_dir=code
     inputdir=input
     ref_outp="output.txt"
@@ -1204,7 +1205,7 @@
     EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`
 else
     DEF_CHECK_LIST='AdGrd Cost AdGrd FDGrd'
-    EMPTY_RESULTS='.. ..'
+    EMPTY_RESULTS='.. .. ..'
     LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
 fi