--- mitgcm.org/front_content/make_summary	2011/08/08 18:22:07	1.67
+++ mitgcm.org/front_content/make_summary	2011/08/23 18:14:10	1.70
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.67 2011/08/08 18:22:07 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.70 2011/08/23 18:14:10 jmc Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -85,7 +85,7 @@
 color="#bbffdd"
 ncolor="#bbddff"
 
-MACHINES="faulks meander aces acesgrid 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"
 
@@ -102,11 +102,12 @@
     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
@@ -139,6 +140,7 @@
 	RESTART=0
 	FAST=0
 	DVLP=0
+	MPI=0
 	MTH=0
 	UR4=0
 	if test -r $dir/summary.txt ; then
@@ -150,21 +152,30 @@
 	      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$'`
 	    if test $yy = 0 ; then OPTFILE="${OPTFILE}+mth" ; fi
@@ -194,7 +205,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
 
@@ -222,7 +233,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>