--- mitgcm.org/scripts/check_outp	2011/08/09 16:40:29	1.29
+++ mitgcm.org/scripts/check_outp	2012/09/08 14:25:13	1.34
@@ -1,12 +1,11 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.29 2011/08/09 16:40:29 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.34 2012/09/08 14:25:13 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
 #    same optfile)
 
-
 usage()
 {
     echo
@@ -101,26 +100,67 @@
 	    fi
 
 	    ADJOINT=
+	    TANGLIN=
 	    RESTART=0
+	    EXTRA=
 	    FAST=0
 	    DVLP=0
+	    MPI=0
 	    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
 		RESTART=`grep -c 'test 2+2=4 summary' $dir/summary.txt`
-		FAST=`grep -c "^run: .*testreport.* '*-fast'*" $dir/summary.txt`
+		comm=`grep '^run: .*testreport.* ' $dir/summary.txt`
+		EXTRA=`echo "$comm" | grep " -*-tdir\>" | sed -e "s/^.* -*-tdir\>//" -e "s/ -.*$//"`
+		if test "x$EXTRA" = x ; then
+		    EXTRA=`echo "$comm" | grep " -*-t\>" | sed -e "s/^.*-*-t\>//" -e "s/ -.*$//"`
+		fi
+		if test "x$EXTRA" = x ; then EXTRA=0 ; else
+		    #echo -n "EXTRA=$EXTRA"
+		    nn0=`echo $EXTRA | sed "s/ *' *//g" | wc -w`
+		    nn1=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<monod_"`
+		    nn2=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<darwin_"`
+		    EXTRA=1
+		    if [ $nn1 -ge 2 ] ; then EXTRA=2 ; fi
+		    if [ $nn2 -ge 2 ] ; then EXTRA=3 ; fi
+		    #echo " : nn0=$nn0 ; nn1=$nn1 ; nn2=$nn2"
+		fi
+		FAST=`echo "$comm" | grep -c " -*-fast\>"`
 		if test "x$FAST" = x0 ; then
-		   FAST=`grep -c "^run: .*testreport.* '*-noieee'*" $dir/summary.txt`
+		   FAST=`echo "$comm" | grep -c " '*-noieee'*"`
 		fi
-		DVLP=`grep -c "^run: .*testreport.* '*-devel'*" $dir/summary.txt`
-		MTH=`grep -c "^run: .*testreport.* -mth" $dir/summary.txt`
-	    fi
-	    if test "x$RESTART" = x0 ; then
-		kind="forward"
-		test "x$ADJOINT" = xtrue  &&  kind="adjoint"
+		DVLP=`echo "$comm" | grep -c " -*-devel\>"`
+		MPI=`echo "$comm" | grep -c " -*-mpi\>"`
+		if test "x$MPI" = x0 ; then
+		   MPI=`echo "$comm" | grep -c " -*-MPI\>"`
+		fi
+		MTH=`echo "$comm" | grep -c " -*-mth\>"`
+		UR4=`echo "$comm" | grep -c " -*-use_r4\>"`
+		if test "x$UR4" = x0 ; then
+		   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
+	    elif test "x$RESTART" = x0 ; then
+		kind="forward" ; order=2
 	    else
-		kind="restart"
+		kind="restart" ; order=3
+	    fi
+	    order=`expr $order + 10 \* $EXTRA`
+	    order=`printf '%3.3i' $order`
+	    if test "x$UR4" = x1 ; then
+		OPTFILE="${OPTFILE}.use_r4"
+	    fi
+	    if test "x$MPI" = x1 ; then
+		yy=`echo $OPTFILE | grep -c '+mpi'`
+		if test $yy = 0 ; then OPTFILE="${OPTFILE}+mpi" ; fi
 	    fi
 	    if test "x$MTH" = x1 ; then
 		yy=`echo $OPTFILE | grep -c '+mth$'`
@@ -136,10 +176,10 @@
 	    ttt=`echo $day | sed -e 's/_[0-9]$//' | sed -e 's/_[0-9][0-9]$//'`
 	    day=`echo $ttt | sed -e 's|_| |g' |awk '{print $NF}'`
 
-            if [ $day -lt $BEFORE ] ; then
-		echo "$OPTFILE$kind $day $OPTFILE $kind $i" >> ./plist
+	    if [ $day -lt $BEFORE ] ; then
+		echo "$OPTFILE$order $day $OPTFILE $kind $i" >> ./plist
 	    elif [ $day -ge $FIRSTDAY -a $day -le $LASTDAY ] ; then
-		echo "$OPTFILE$kind $day $OPTFILE $kind $i" >> ./slist
+		echo "$OPTFILE$order $day $OPTFILE $kind $i" >> ./slist
 	    else
 		if test $dBug = 't' ; then
 		   echo "discard day='$day' from: $i" | tee -a $OUTPFIL
@@ -185,9 +225,9 @@
 
     # If the previous option needs an argument, assign it.
     if test -n "$ac_prev"; then
-        eval "$ac_prev=\$ac_option"
-        ac_prev=
-        continue
+	eval "$ac_prev=\$ac_option"
+	ac_prev=
+	continue
     fi
 
     ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`