--- mitgcm.org/scripts/check_outp	2009/07/12 16:29:42	1.17
+++ mitgcm.org/scripts/check_outp	2010/03/22 14:45:20	1.21
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.17 2009/07/12 16:29:42 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.21 2010/03/22 14:45:20 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
@@ -267,9 +267,9 @@
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
 if test "x$MACHINES" = "x_All_" ; then
-  MACHINES="faulks meander lagoon harbor dickens danton aces"
-  MACHINES="$MACHINES beagle columbia edvir rays solasrv sx8 xd1"
-  MACHINES="$MACHINES bigred starp"
+  MACHINES="faulks meander lagoon aces dickens danton beagle harbor"
+  MACHINES="$MACHINES columbia pleiades iblade rays solssrv solasrv sx8"
+  MACHINES="$MACHINES trane dodongo dokdo bigred"
 
   MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
   for madd in $MALL ; do
@@ -318,12 +318,20 @@
             num=`grep -c "^$key" ./plist`
           fi
 	  #- discard unsafe test:
-	  dd=`echo $optf | grep -c 'gfortran.*+mth'`
+	  dd=`echo $optf | grep -c 'gfortran+mth'`
 	  #if test $mname = 'lagoon' -a $dd = 1 ; then num=-1 ; fi
 	  #if test $mname = 'harbor' -a $dd = 1 ; then num=-1 ; fi
 	  #if test $mname = 'aces' -a $optf = 'linux_ia32_open64' ; then num=-1 ; fi
 	  #if test $mname = 'aces' -a $optf = 'linux_ia32_g95' ; then num=-1 ; fi
-          if test $num -gt 0 ; then
+	  dd=`echo $optf | grep -c 'bigred.*+mth'`
+	  #if test $mname = 'bigred' -a $dd = 1 ; then num=-1 ; fi
+	  if test $num -lt 0 ; then
+	    echo "  discard $sdir : $type , of='$optf'" | tee -a $OUTPFIL
+            cmis=`expr $cmis + 1`
+          elif test $num = '0' ; then
+            echo "no previous test for:" $key | tee -a $OUTPFIL
+            cmis=`expr $cmis + 1`
+	  else
 	    pline=`grep "^$key " ./plist | head -1`
 	    if test $dBug = 't' ; then 
 		echo "s='$sline'" | tee -a $OUTPFIL
@@ -339,18 +347,14 @@
 				 | sed 's/ OPTFILE=.*\// OPTFILE=/g' \
                                  | grep -v '^[A-S][a-t]* time:  ' > tmpfp
 	    #-- re-order list of exp (according to local "sort" order)
-	    listD=`grep '^[YN] [YN] [YN] [YN]' tmpfs \
-                 | sed 's/^[YN] .*pass //' | sed 's/^[YN] .*FAIL //' \
-                 | sed 's/^[YN] .*N\/O  //' | sort`
+	    listD=`grep '^[YN] [YN] [YN] [YN]' tmpfs | awk '{print $NF}' | sort`
 	    for xx in $listD
 	    do
 		sed "/ $xx\$/d" tmpfs > tmpfn
 		sed -n "/ $xx\$/p" tmpfs >> tmpfn
 		mv tmpfn tmpfs
 	    done
-	    listD=`grep '^[YN] [YN] [YN] [YN]' tmpfp \
-                 | sed 's/^[YN] .*pass //' | sed 's/^[YN] .*FAIL //' \
-                 | sed 's/^[YN] .*N\/O  //' | sort`
+	    listD=`grep '^[YN] [YN] [YN] [YN]' tmpfp | awk '{print $NF}' | sort`
 	    for xx in $listD
 	    do
 		sed "/ $xx\$/d" tmpfp > tmpfn
@@ -395,14 +399,9 @@
                 cdif=`expr $cdif + 1`
 		echo '----------------------------------------' | tee -a $OUTPFIL
 	    else
-		echo "" | tee -a $OUTPFIL
+		echo " $type , of='$optf'" | tee -a $OUTPFIL
 	    fi
 	    rm -f tmpfs tmpfp tmpdf
-	  elif test $num = '0' ; then
-            echo "no previous test for:" $key | tee -a $OUTPFIL
-            cmis=`expr $cmis + 1`
-	  else
-            cmis=`expr $cmis + 1`
           fi
 	done
         if [ $cmis -gt 0 ] ; then tmis='(-'$cmis')' ; else tmis='(--)' ; fi