--- mitgcm.org/scripts/check_outp	2012/08/16 02:48:24	1.32
+++ mitgcm.org/scripts/check_outp	2013/02/24 15:29:05	1.35
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.32 2012/08/16 02:48:24 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.35 2013/02/24 15:29:05 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
@@ -102,6 +102,7 @@
 	    ADJOINT=
 	    TANGLIN=
 	    RESTART=0
+	    EXTRA=
 	    FAST=0
 	    DVLP=0
 	    MPI=0
@@ -113,30 +114,47 @@
 		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`
-		MPI=`grep -c "^run: .*testreport.* -mpi " $dir/summary.txt`
+		DVLP=`echo "$comm" | grep -c " -*-devel\>"`
+		MPI=`echo "$comm" | grep -c " -*-mpi\>"`
 		if test "x$MPI" = x0 ; then
-		   MPI=`grep -c "^run: .*testreport.* -MPI " $dir/summary.txt`
+		   MPI=`echo "$comm" | grep -c " -*-MPI\>"`
 		fi
-		MTH=`grep -c "^run: .*testreport.* -mth" $dir/summary.txt`
-		UR4=`grep -c "^run: .*testreport.* -use_r4 " $dir/summary.txt`
+		MTH=`echo "$comm" | grep -c " -*-mth\>"`
+		UR4=`echo "$comm" | grep -c " -*-use_r4\>"`
 		if test "x$UR4" = x0 ; then
-		   UR4=`grep -c "^run: .*testreport.* -ur4 " $dir/summary.txt`
+		   UR4=`echo "$comm" | grep -c " -*-ur4\>"`
 		fi
 	    fi
 	    if test "x$ADJOINT" = xtrue ; then
-		kind="adjoint" ; order='000'
+		kind="adjoint" ; order=0
 	    elif test "x$TANGLIN" = xtrue ; then
-		kind="tanglin" ; order='001'
+		kind="tanglin" ; order=1
 	    elif test "x$RESTART" = x0 ; then
-		kind="forward" ; order='002'
+		kind="forward" ; order=2
 	    else
-		kind="restart" ; order='003'
+		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
@@ -326,9 +344,8 @@
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
 if test "x$MACHINES" = "x_All_" ; then
-  MACHINES="faulks meander aces- acesgrid baudelaire dickens danton beagle harbor"
-  MACHINES="$MACHINES pleiades iblade rays solasrv sx8"
-  MACHINES="$MACHINES trane dodongo dokdo stomp bigred"
+  MACHINES="aces- acesgrid baudelaire dickens danton beagle"
+  MACHINES="$MACHINES pleiades iblade sx8 uv100 solasrv stomp weber"
 
   MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
   for madd in $MALL ; do