--- mitgcm.org/scripts/check_outp	2011/06/29 14:00:59	1.28
+++ mitgcm.org/scripts/check_outp	2011/08/23 18:14:10	1.31
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.28 2011/06/29 14:00:59 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.31 2011/08/23 18:14:10 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
@@ -104,7 +104,9 @@
 	    RESTART=0
 	    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
@@ -114,13 +116,29 @@
 		   FAST=`grep -c "^run: .*testreport.* '*-noieee'*" $dir/summary.txt`
 		fi
 		DVLP=`grep -c "^run: .*testreport.* '*-devel'*" $dir/summary.txt`
+		MPI=`grep -c "^run: .*testreport.* -mpi " $dir/summary.txt`
+		if test "x$MPI" = x0 ; then
+		   MPI=`grep -c "^run: .*testreport.* -MPI " $dir/summary.txt`
+		fi
 		MTH=`grep -c "^run: .*testreport.* -mth" $dir/summary.txt`
+		UR4=`grep -c "^run: .*testreport.* -use_r4 " $dir/summary.txt`
+		if test "x$UR4" = x0 ; then
+		   UR4=`grep -c "^run: .*testreport.* -ur4 " $dir/summary.txt`
+		fi
 	    fi
-	    if test "x$RESTART" = x0 ; then
-		kind="forward"
-		test "x$ADJOINT" = xtrue  &&  kind="adjoint"
+	    if test "x$ADJOINT" = xtrue ; then
+		kind="adjoint" ; order='000'
+	    elif test "x$RESTART" = x0 ; then
+		kind="forward" ; order='001'
 	    else
-		kind="restart"
+		kind="restart" ; order='002'
+	    fi
+	    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$'`
@@ -137,9 +155,9 @@
 	    day=`echo $ttt | sed -e 's|_| |g' |awk '{print $NF}'`
 
             if [ $day -lt $BEFORE ] ; then
-		echo "$OPTFILE$kind $day $OPTFILE $kind $i" >> ./plist
+		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
@@ -304,7 +322,7 @@
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
 if test "x$MACHINES" = "x_All_" ; then
-  MACHINES="faulks meander aces.jmc aces.ce107 baudelaire dickens danton beagle harbor"
+  MACHINES="faulks meander aces- acesgrid baudelaire dickens danton beagle harbor"
   MACHINES="$MACHINES pleiades iblade rays solasrv sx8"
   MACHINES="$MACHINES trane dodongo dokdo stomp bigred"
 
@@ -325,6 +343,7 @@
 
 for pname in $MACHINES ; do
 
+    sname=`echo $pname | sed 's/-$//'`
     mname=`echo $pname | sed 's/\./ /g' | awk '{print $1}'`
     sUser=
     if test $mname != $pname ; then
@@ -370,7 +389,7 @@
 	  #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
 	  dd=`echo $optf | grep -c 'bigred.*noieee'`
-	  if test $mname = 'bigred' -a $dd = 1 ; then num=-1 ; fi
+	  #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`
@@ -451,7 +470,7 @@
 	  fi
 	done
 	if [ $cmis -gt 0 ] ; then tmis='(-'$cmis')' ; else tmis='(--)' ; fi
-	printf '%11s :  %3i      %4s   %3i  ' $pname $ctot $tmis $cdif >> $OUTPSUM
+	printf '%11s :  %3i      %4s   %3i  ' $sname $ctot $tmis $cdif >> $OUTPSUM
 	if [ $cdif -gt 0 ] ; then
 	  echo "   $clin" >> $OUTPSUM
 	else echo "" >> $OUTPSUM ; fi