--- mitgcm.org/front_content/make_summary	2011/06/28 18:31:20	1.66
+++ mitgcm.org/front_content/make_summary	2012/09/04 20:12:20	1.73
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.66 2011/06/28 18:31:20 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.73 2012/09/04 20:12:20 jmc Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -10,12 +10,12 @@
 {
     echo
     echo "Usage:  $0 [OPTIONS]"
-    echo 
+    echo
     echo "where possible OPTIONS are:"
     echo "  (-help|-h)           print usage"
     echo "  (-date |-d )PERIOD   run for PERIOD=\"YYYY_MM\""
     echo "                         [def=\"$PERIOD\"]"
-    echo 
+    echo
     exit 1
 }
 
@@ -38,19 +38,19 @@
     ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
     case $ac_option in
-	
+
 	-help | --help | -h | --h)
 	    usage ;;
-	
-        -date | --date | -d | --d)
-            ac_prev=PERIOD ;;
-        --date=* | -date=*)
-            PERIOD=$ac_optarg ;;
 
-        *)
+	-date | --date | -d | --d)
+	    ac_prev=PERIOD ;;
+	--date=* | -date=*)
+	    PERIOD=$ac_optarg ;;
+
+	*)
 	    echo "Error: don't understand argument \"$ac_option\""
 	    usage
-            ;;
+	    ;;
 
      esac
 
@@ -85,7 +85,7 @@
 color="#bbffdd"
 ncolor="#bbddff"
 
-MACHINES="faulks meander aces 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"
 
@@ -95,18 +95,19 @@
 for madd in $MALL ; do
     present=0
     for m in $MACHINES ; do
-        echo $madd | grep $m > /dev/null 2>&1
-        RETVAL=$?
-        test $RETVAL = 0  &&  present=1
-        continue
+	echo $madd | grep $m > /dev/null 2>&1
+	RETVAL=$?
+	test $RETVAL = 0  &&  present=1
+	continue
     done
     test $present = 0  &&  MACHINES="$MACHINES $madd"
 done
-#MACHINES="faulks"
+#MACHINES="baudelaire"
 
 for mname in $MACHINES ; do
 
     echo "  $mname"
+    sname=`echo $mname | sed 's/-$//'`
 
     dir_list=`grep $mname ./dir_all`
     echo -n "" > ./mlist
@@ -135,36 +136,62 @@
 	    OPTFILE="not_explicitly_specified"
 	fi
 
+	# EXTRA = non-standard list of experiment
 	ADJOINT=
+	TANGLIN=
 	RESTART=0
+	EXTRA=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
+	    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 -c " -*-tdir\>"`
+	    if test "x$EXTRA" = x0 ; then
+		EXTRA=`echo "$comm" | grep -c " -*-t\>"`
+	    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=`echo "$comm" | grep -c " -*-devel\>"`
+	    MPI=`echo "$comm" | grep -c " -*-mpi\>"`
+	    if test "x$MPI" = x0 ; then
+	       MPI=`echo "$comm" | grep -c " -*-MPI\>"`
 	    fi
-	    DVLP=`grep -c "^run: .*testreport.* '*-devel'*" $dir/summary.txt`
-	    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$RESTART" = x0 ; then
-	    kind="forward"
-	    test "x$ADJOINT" = xtrue  &&  kind="adjoint"
+	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
+	if test "x$EXTRA" != x0 ; then
+	    order=`expr $order + 4`
+	fi
+	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$'`
 	    if test $yy = 0 ; then OPTFILE="${OPTFILE}+mth" ; fi
@@ -194,7 +221,7 @@
 	DAY=`cat ./ms_tmp | awk '(length($1)==8 && substr($1,0,2)=="20")'`
 	rm -f ./ms_tmp
 
-	echo "$OPTFILE$kind $DAY $OPTFILE $kind $i $t_pass:$t_tot" >> ./mlist
+	echo "$OPTFILE$order $DAY $OPTFILE $kind $i $t_pass:$t_tot" >> ./mlist
 
     done
 
@@ -206,9 +233,9 @@
     if test $num -gt 0 ; then
 
 	# swap colors
-        ctmp=$color
-        color=$ncolor
-        ncolor=$ctmp
+	ctmp=$color
+	color=$ncolor
+	ncolor=$ctmp
 
 	keys=`cat ./mlist | cut -d " " -f 1 | sort | uniq`
 
@@ -222,7 +249,7 @@
 	    URL="results/$PERIOD/$ldir"
 	    cat <<EOF >>$OUTFILE
 <tr bgcolor="$color">
-  <td height="0"> $mname </td>
+  <td height="0"> $sname </td>
   <td> $optf </td>
   <td> $kind </td>
   <td> <a href="$res_url$URL">$DAY</a> </td>