--- mitgcm.org/scripts/check_outp	2013/03/06 20:30:29	1.36
+++ mitgcm.org/scripts/check_outp	2013/04/05 21:15:52	1.38
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.36 2013/03/06 20:30:29 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.38 2013/04/05 21:15:52 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
@@ -101,8 +101,9 @@
 		fi
 	    fi
 
-	    ADJOINT=
-	    TANGLIN=
+	    ADJOINT=0
+	    TANGLIN=0
+	    OPENAD=0
 	    RESTART=0
 	    EXTRA=
 	    FAST=0
@@ -111,10 +112,14 @@
 	    MTH=0
 	    UR4=0
 	    if test -r $dir/summary.txt ; then
-		comm=`grep 'ADJOINT=true' $dir/summary.txt 2>/dev/null`
-		eval $comm
-		comm=`grep 'TANGLIN=true' $dir/summary.txt 2>/dev/null`
-		eval $comm
+		ADJOINT=`grep -c -i '^ADJOINT' $dir/summary.txt`
+		if test "x$ADJOINT" = x1 ; then
+		  OPENAD=`grep -c '^Adjoint .* OpenAD' $dir/summary.txt`
+		fi
+		TANGLIN=`grep -c -i '^TANGLIN' $dir/summary.txt`
+		if test "x$TANGLIN" = x1 ; then
+		  OPENAD=`grep -c '^TangLin .* OpenAD' $dir/summary.txt`
+		fi
 		RESTART=`grep -c 'test 2+2=4 summary' $dir/summary.txt`
 		comm=`grep '^run: .*testreport.* ' $dir/summary.txt`
 		EXTRA=`echo "$comm" | grep " -*-tdir\>" | sed -e "s/^.* -*-tdir\>//" -e "s/ -.*$//"`
@@ -146,14 +151,16 @@
 		   UR4=`echo "$comm" | grep -c " -*-ur4\>"`
 		fi
 	    fi
-	    if test "x$ADJOINT" = xtrue ; then
-		kind="adjoint" ; order=0
-	    elif test "x$TANGLIN" = xtrue ; then
-		kind="tanglin" ; order=1
+	    if test "x$ADJOINT" = x1 ; then
+		kind="adm-TAF" ; order=0
+		if test "x$OPENAD" = x1 ; then kind="adm-OAD" ; order=2 ; fi
+	    elif test "x$TANGLIN" = x1 ; then
+		kind="tlm-TAF" ; order=1
+		if test "x$OPENAD" = x1 ; then kind="tlm-OAD" ; order=3 ; fi
 	    elif test "x$RESTART" = x0 ; then
-		kind="forward" ; order=2
+		kind="forward" ; order=4
 	    else
-		kind="restart" ; order=3
+		kind="restart" ; order=5
 	    fi
 	    order=`expr $order + 10 \* $EXTRA`
 	    order=`printf '%3.3i' $order`
@@ -310,7 +317,9 @@
   if test -f $PRC_MAILS -a -f $OUTPSUM -a $FIRSTDAY = $CURR_DAY ; then
     #- if update-log-file is older than previous output summary, just return
     if test $PRC_MAILS -ot $OUTPSUM ; then
-      echo " t4update: skip "`basename $0`" ( $PRC_MAILS older than $OUTPSUM )" | tee -a $OUTPFIL
+      echo ' '$CMDLINE | tee -a $OUTPSUM
+      echo " t4update: skip "`basename $0`" ( $PRC_MAILS older than $OUTPSUM )" | tee -a $OUTPSUM
+      echo "End  time:   "`date` | tee -a $OUTPSUM
       exit 0
     else
       if test -e $OUTPFIL ; then mv -f $OUTPFIL $OUTPFIL'_bak' ; fi
@@ -324,6 +333,8 @@
   mv -f $OUTPFIL $OUTPFIL'_bak'
   touch $OUTPFIL
 fi
+if test -e $OUTPSUM ; then mv -f $OUTPSUM $OUTPSUM'_bak' ; fi
+echo ' '$CMDLINE > $OUTPSUM
 
 echo "CMDLINE='$CMDLINE'" >> $OUTPFIL
 echo "PERIOD='$PERIOD' , PREV_P='$PREV_P'" >> $OUTPFIL
@@ -348,9 +359,6 @@
   exit 3
 fi
 
-if test -e $OUTPSUM ; then mv -f $OUTPSUM $OUTPSUM'_bak' ; fi
-echo ' '$CMDLINE > $OUTPSUM
-
 if test $FIRSTDAY = $LASTDAY ; then
   echo -n "Checking latest output from $FIRSTDAY" | tee -a $OUTPSUM
 else