--- mitgcm.org/front_content/make_summary	2010/01/20 03:02:49	1.60
+++ 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.60 2010/01/20 03:02:49 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.
@@ -10,15 +10,16 @@
 {
     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
 }
 
+export LC_ALL="en_US.UTF-8"
 CURR_PER=`date +%Y`"_"`date +%m`
 # defaults
 PERIOD=$CURR_PER
@@ -84,9 +85,9 @@
 color="#bbffdd"
 ncolor="#bbddff"
 
-MACHINES="faulks meander lagoon harbor dickens danton aces"
-MACHINES="$MACHINES beagle columbia pleiades iblade rays solssrv solasrv sx8"
-MACHINES="$MACHINES bigred starp"
+MACHINES="faulks meander aces- acesgrid baudelaire dickens danton beagle harbor"
+MACHINES="$MACHINES pleiades iblade rays solasrv sx8"
+MACHINES="$MACHINES trane dodongo dokdo stomp bigred"
 
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
@@ -101,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
@@ -136,27 +138,53 @@
 
 	ADJOINT=
 	RESTART=0
-	NOI3E=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
 	    RESTART=`grep -c 'test 2+2=4 summary' $dir/summary.txt`
-	    NOI3E=`grep -c "^run: .*testreport.* '*-noieee'*" $dir/summary.txt`
+	    FAST=`grep -c "^run: .*testreport.* '*-fast'*" $dir/summary.txt`
+	    if test "x$FAST" = x0 ; then
+	      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`
-	fi
-	if test "x$RESTART" = x0 ; then
-	    kind="forward"
-	    test "x$ADJOINT" = xtrue  &&  kind="adjoint"
+	    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$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
 	fi
-	if test "x$NOI3E" = x1 ; then
-	    OPTFILE="${OPTFILE}.noieee"
+	if test "x$FAST" = x1 ; then
+	    OPTFILE="${OPTFILE}.fast"
+	fi
+	if test "x$DVLP" = x1 ; then
+	    OPTFILE="${OPTFILE}.dvlp"
 	fi
 
 	t_pass="--"
@@ -177,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
 
@@ -205,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>