--- mitgcm.org/front_content/make_summary	2012/08/16 02:42:56	1.72
+++ mitgcm.org/front_content/make_summary	2013/08/22 21:32:54	1.78
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.72 2012/08/16 02:42:56 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.78 2013/08/22 21:32:54 jmc Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -30,9 +30,9 @@
 
     # If the previous option needs an argument, assign it.
     if test -n "$ac_prev"; then
-        eval "$ac_prev=\$ac_option"
-        ac_prev=
-        continue
+	eval "$ac_prev=\$ac_option"
+	ac_prev=
+	continue
     fi
 
     ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
@@ -64,6 +64,18 @@
 OUTFILE=$OUTDIR"/output_"$PERIOD".html"
 res_url="http://mitgcm.org/testing/"
 
+#TMP=./mksum_$$
+#- try to put temporary files in system-local /tmp dir
+TMP=/tmp/mksum_$$
+touch $TMP ; retVal=$?
+if [ $retVal -eq 0 ] ; then
+  if test ! -r $TMP ; then TMP=./mksum_$$ ; fi
+else
+  TMP=./mksum_$$
+fi
+rm -f $TMP
+# echo "temp files: $TMP"
+
 #  Create the links in $OUTFILE :
 echo "Creating the \"latest\" file for each machine: "
 the_date=`date`
@@ -85,13 +97,12 @@
 color="#bbffdd"
 ncolor="#bbddff"
 
-MACHINES="faulks meander aces- acesgrid baudelaire dickens danton beagle harbor"
-MACHINES="$MACHINES pleiades iblade rays solasrv sx8"
-MACHINES="$MACHINES trane dodongo dokdo stomp bigred"
+MACHINES="aces- acesgrid baudelaire dickens danton beagle"
+MACHINES="$MACHINES pleiades iblade sx8 uv100 solasrv stomp weber"
 
-( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
+( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > $TMP.dir_all
 
-MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
+MALL=`cat $TMP.dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
 for madd in $MALL ; do
     present=0
     for m in $MACHINES ; do
@@ -107,10 +118,9 @@
 for mname in $MACHINES ; do
 
     echo "  $mname"
-    sname=`echo $mname | sed 's/-$//'`
 
-    dir_list=`grep $mname ./dir_all`
-    echo -n "" > ./mlist
+    dir_list=`grep $mname $TMP.dir_all`
+    echo -n "" > $TMP.mlist
 
     for i in $dir_list ; do
 
@@ -136,44 +146,74 @@
 	    OPTFILE="not_explicitly_specified"
 	fi
 
-	ADJOINT=
-	TANGLIN=
+	# EXTRA = non-standard list of experiment
+	ADJOINT=0
+	TANGLIN=0
+	OPENAD=0
 	RESTART=0
+	EXTRA=
 	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
+	    ADJOINT=`grep -c -i '^ADJOINT' $dir/summary.txt`
+	    if test "x$ADJOINT" = x1 ; then
+	      OPENAD=`grep -c '^Adjoint .* OpenAD' $dir/summary.txt`
+            fi
+	    TANGLIN=`grep -c -i '^TANGLIN' $dir/summary.txt`
+	    if test "x$TANGLIN" = x1 ; then
+	      OPENAD=`grep -c '^TangLin .* OpenAD' $dir/summary.txt`
+            fi
 	    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 " -*-tdir\>" | sed -e "s/^.* -*-tdir\>//" -e "s/ -.*$//"`
+	    if test "x$EXTRA" = x ; then
+		EXTRA=`echo "$comm" | grep " -*-t\>" | sed -e "s/^.*-*-t\>//" -e "s/ -.*$//"`
+	    fi
+	    if test "x$EXTRA" = x ; then EXTRA=0 ; else
+		#echo -n "EXTRA=$EXTRA"
+		nn0=`echo $EXTRA | sed "s/ *' *//g" | wc -w`
+		nn1=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<monod_"`
+		nn2=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<darwin_"`
+		EXTRA=1
+                if [ $nn1 -ge 2 ] ; then EXTRA=2 ; fi
+                if [ $nn2 -ge 2 ] ; then EXTRA=3 ; fi
+		#echo " : nn0=$nn0 ; nn1=$nn1 ; nn2=$nn2"
+	    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=`grep -c "^run: .*testreport.* '*-devel'*" $dir/summary.txt`
-	    MPI=`grep -c "^run: .*testreport.* -mpi " $dir/summary.txt`
+	    DVLP=`echo "$comm" | grep -c " -*-devel\>"`
+	    MPI=`echo "$comm" | grep -c " -*-mpi\>"`
 	    if test "x$MPI" = x0 ; then
-	       MPI=`grep -c "^run: .*testreport.* -MPI " $dir/summary.txt`
+		MPI=`echo "$comm" | grep -c " -*-MPI\>"`
 	    fi
-	    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$ADJOINT" = xtrue ; then
-	    kind="adjoint" ; order='000'
-	elif test "x$TANGLIN" = xtrue ; then
-	    kind="tanglin" ; order='001'
+	if test "x$ADJOINT" = x1 ; then
+	    kind="adjoint-taf" ; order=0
+	  if test "x$OPENAD" = x1 ; then
+	    kind="adjoint-oad" ; order=2
+          fi
+	elif test "x$TANGLIN" = x1 ; then
+	    kind="tanglin-taf" ; order=1
+	  if test "x$OPENAD" = x1 ; then
+	    kind="tanglin-oad" ; order=3
+          fi
 	elif test "x$RESTART" = x0 ; then
-	    kind="forward" ; order='002'
+	    kind="forward" ; order=4
 	else
-	    kind="restart" ; order='003'
+	    kind="restart" ; order=5
 	fi
+	order=`expr $order + 10 \* $EXTRA`
+	order=`printf '%3.3i' $order`
 	if test "x$UR4" = x1 ; then
 	    OPTFILE="${OPTFILE}.use_r4"
 	fi
@@ -210,15 +250,15 @@
 	DAY=`cat ./ms_tmp | awk '(length($1)==8 && substr($1,0,2)=="20")'`
 	rm -f ./ms_tmp
 
-	echo "$OPTFILE$order $DAY $OPTFILE $kind $i $t_pass:$t_tot" >> ./mlist
+	echo "$OPTFILE$order $DAY $OPTFILE $kind $i $t_pass:$t_tot" >> $TMP.mlist
 
     done
 
     # helpful for debugging
-    # cat ./mlist
+    # cat $TMP.mlist
 
     #  Do we have any data?  If so, create the latest pointer.
-    num=`wc -l ./mlist | awk '{print $1}'`
+    num=`wc -l $TMP.mlist | awk '{print $1}'`
     if test $num -gt 0 ; then
 
 	# swap colors
@@ -226,16 +266,21 @@
 	color=$ncolor
 	ncolor=$ctmp
 
-	keys=`cat ./mlist | cut -d " " -f 1 | sort | uniq`
+	keys=`cat $TMP.mlist | cut -d " " -f 1 | sort | uniq`
 
 	for key in $keys ; do
-	    tline=`grep "^$key " ./mlist | head -1`
+	    tline=`grep "^$key " $TMP.mlist | head -1`
 	    ratio=`echo $tline | cut -d " " -f 6`
 	    ldir=`echo $tline | cut -d " " -f 5`
 	    kind=`echo $tline | cut -d " " -f 4`
 	    optf=`echo $tline | cut -d " " -f 3`
 	    DAY=`echo $tline | cut -d " " -f 2`
 	    URL="results/$PERIOD/$ldir"
+	    #-- machine name to print:
+	    sname=`echo $mname | sed 's/-$//'`
+	    alt=`echo $key | sed "s/$optf//"`
+	   #if   [ $alt -ge 30 ] ; then sname="${sname}.darwin"
+	   #elif [ $alt -ge 20 ] ; then sname="${sname}.monod" ; fi
 	    cat <<EOF >>$OUTFILE
 <tr bgcolor="$color">
   <td height="0"> $sname </td>
@@ -268,7 +313,7 @@
 
 EOF
 
-rm -f ./dir_all ./mlist
+rm -f $TMP.dir_all $TMP.mlist
 
 #- put the file in place
 chgrp gcmpack $OUTFILE