--- MITgcm/verification/testreport	2008/08/19 18:29:12	1.117
+++ MITgcm/verification/testreport	2009/01/30 20:08:09	1.121
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.117 2008/08/19 18:29:12 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.121 2009/01/30 20:08:09 jmc Exp $
 #  $Name:  $
 #
 
@@ -30,6 +30,7 @@
     echo "                             Bourne-compatible \"sh\" shell"
     echo "                             (DEF=\"\" for \"bash\")"
     echo "  (-adm|-ad)               perform an adjoint run"
+    echo "  (-oad)                   perform an OpenAD adjoint run"
     echo "  (-command) STRING        command to run"
     echo "                             (DEF=\"make output.txt\")"
     echo "  (-m|-make) STRING        command to use for \"make\""
@@ -211,7 +212,7 @@
 		eval "HAVE_PTR0"$ii"=t"
 	    else
 		eval "HAVE_PTR0"$ii"=f"
-	      if test "x$ADM" = x ; then
+	      if test "x$ADM" = x -a "x$OADM" = x; then
 	      # remove this ptr from the list of output variable to check
 	      # echo "-- ptr test=" $tst "number of var=" `echo $listVar | awk '{print NF}'` 1>&2
 		listVar=`echo "$listVar" | sed "s/ pt$ii..//g"`
@@ -314,10 +315,12 @@
 	(
 	    cd $1;
 	    command="$GENMAKE2  -ds -m $MAKE"
-	    if test "x$ADM" = x ; then
-		command="$command --mods=../code"
-	    else
+	    if test "x$ADM" = xt ; then
 		command="$command --mods=../code_ad"
+	    elif test "x$OADM" = xt ; then
+		command="$command -adof ../../../tools/adjoint_options/adjoint_oad -mods '../code_oad ../../OpenAD/code_oad_all'"
+	    else
+		command="$command --mods=../code"
 	    fi
 	    if test "x$OPTFILE" != xNONE ; then
 		command="$command --optfile=$OPTFILE"
@@ -342,7 +345,8 @@
 	    fi
 	    fi
 	    printf 'genmake ... ' 1>&2
-	    $command > make.log 2>&1
+	    # $command > make.log 2>&1
+	    eval $command > make.log 2>&1
 	    RETVAL=$?
 	    #  Reduce the size of the testing emails!
 	    head -100 Makefile > $CDIR/Makefile_head
@@ -437,14 +441,16 @@
 	cd $1;
 	if test -r Makefile ; then
 	    printf 'make ... ' 1>&2
-	    if test "x$ADM" = x ; then
+	    if test "x$ADM" = xt ; then
+		$MAKE adall >> make.log 2>&1
+	    elif test "x$OADM" = xt ; then
+		$MAKE adAll >> make.log 2>&1
+            else
 		if test "x$JOBS" = x ; then
 		    $MAKE >> make.log 2>&1
 		else
 		    $MAKE -j $JOBS >> make.log 2>&1
 		fi
-	    else
-		$MAKE adall >> make.log 2>&1
 	    fi
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
@@ -566,52 +572,52 @@
 	echo
 	if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
 	    diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
-	    outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi
+	    outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; fi
 	fi
         if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
-	    echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
+	    echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_tmp
 	    ln -sf "../"$builddir"/"$EXECUTABLE .
 	fi
         if test ! -x $EXECUTABLE ; then
-		rm -f run.log ; touch run.log
-		if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
-		echo " no executable:" $EXECUTABLE >> run.log
+		rm -f $RUNLOG ; touch $RUNLOG
+		if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
+		echo " no executable:" $EXECUTABLE >> $RUNLOG
 		RETVAL=8
 		ENDVAL=-1
 	else
             if test ! -f $OUTPUTFILE -o $OUTPUTFILE -ot $EXECUTABLE ; then
               # output do not exist or is older than executable:
-		rm -f run.log ; touch run.log
-		if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
-		( eval $COMMAND ) >> run.log 2>&1
+		rm -f $RUNLOG ; touch $RUNLOG
+		if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
+		( eval $COMMAND ) >> $RUNLOG 2>&1
 		RETVAL=$?
 	    else
 		RETVAL=0
-		if test -f run.log ; then
-		    if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
-     		    echo "---------->> $OUTPUTFILE is up to date " >> run.log 2>&1
+		if test -f $RUNLOG ; then
+		    if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
+     		    echo "---------->> $OUTPUTFILE is up to date " >> $RUNLOG 2>&1
 		else 
-		    touch run.log
-		    if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
-     		    echo "---------->> $OUTPUTFILE is up to date " >> run.log 2>&1
-     		    echo " no previous run.log: assume NORMAL END" >> run.log 2>&1
+		    touch $RUNLOG
+		    if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
+     		    echo "---------->> $OUTPUTFILE is up to date " >> $RUNLOG 2>&1
+     		    echo " no previous $RUNLOG: assume NORMAL END" >> $RUNLOG 2>&1
 		fi
 	    fi
-	    ENDVAL=`cat run.log | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`
+	    ENDVAL=`cat $RUNLOG | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`
 	fi
-	rm -f run.log_00
+	rm -f run.log_tmp
 	#if test "x$RETVAL" = x0 ; then
 	if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
-	    tail run.log
+	    tail $RUNLOG
 	    echo successful 1>&2
 	    # === Reduce the size of the testing emails!
 	    #cp $OUTPUTFILE $CDIR"/"$OUTPUTFILE
             if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	    return 0
 	else
-	    tail run.log
+	    tail $RUNLOG
 	    echo failed '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2
-	    cp run.log $CDIR"/run.log"
+	    cp $RUNLOG $CDIR"/"$RUNLOG
             if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	    return 1
 	fi
@@ -755,6 +761,7 @@
 DELDIR=
 
 ADM=
+OADM=
 
 # list of pTracers to check for monitor output
 PTRACERS_NUM="1 2 3 4 5"
@@ -856,6 +863,8 @@
 
 	-adm | -ad) ADM=t ;;
 
+	-oad) OADM=t; NODEPEND=t ;;
+
 	-ieee) IEEE=true ;;
 	-noieee) IEEE= ;;
         -gsl) GSL=t ;;
@@ -898,6 +907,11 @@
     inputdir=input_ad
     ref_outp="output_adm.txt"
     EXECUTABLE="mitgcmuv_ad"
+elif test "x$OADM" = xt ; then
+    code_dir=code_oad
+    inputdir=input_oad
+    ref_outp="output_oadm.txt"
+    EXECUTABLE="mitgcmuv_ad"
 else
     code_dir=code
     inputdir=input
@@ -950,6 +964,7 @@
     OPTFILE=$MITGCM_OF
 fi
 
+RUNLOG="run.log"
 OUTPUTFILE=$ref_outp
 if test "x$COMMAND" = x ; then
     COMMAND="./$EXECUTABLE > $OUTPUTFILE"
@@ -964,7 +979,7 @@
 #  (use default or load experiment-specific list from file "tr_checklist")
 # content : 1rst = main variable used to decide if it pass or FAIL
 #         others = number of matching digits to be printed in summary.txt
-if test "x$ADM" = x ; then
+if test "x$ADM" = x -a "x$OADM" = x; then
     DEF_CHECK_LIST='PS PS T+ S+ U+ V+ pt1+ pt2+ pt3+ pt4+ pt5+'
     EMPTY_RESULTS='.. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..'
     LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
@@ -988,13 +1003,20 @@
 
 #  Create a uniquely named directory to store results
 CMDLINE=$0
-for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done
+for xx in "$@" ; do nw=`echo $xx | wc -w`
+    if test $nw = '1' ; then CMDLINE="$CMDLINE $xx"
+                        else CMDLINE="$CMDLINE '$xx'" ; fi
+done
+#for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done
 MACH=`hostname`
 UNAMEA=`uname -a`
 DATE=`date +%Y%m%d`
 BASE="tr_"$MACH"_"$DATE"_"
 if test "x$OUTDIR" != x ; then
     BASE="tr_"$OUTDIR"_"$DATE"_"
+else
+    short_name=`hostname | sed 's/\..*$//'`
+    BASE="tr_"$short_name"_"$DATE"_"
 fi
 DNUM=0
 DRESULTS="$BASE$DNUM"
@@ -1041,7 +1063,7 @@
 fi
 echo
 echo >> $SUMMARY
-if test "x$ADM" = x ; then
+if test "x$ADM" = x -a "x$OADM" = x; then
     if [ $MATCH_CRIT -lt 10 ] ; 
     then line_0="default  "$MATCH_CRIT ; 
     else line_0="default "$MATCH_CRIT ; fi