--- mitgcm.org/front_content/make_summary 2011/08/19 20:38:19 1.69 +++ mitgcm.org/front_content/make_summary 2012/08/15 18:27:54 1.71 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.69 2011/08/19 20:38:19 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.71 2012/08/15 18:27:54 jmc Exp $ # # The purpose of this script is to create HTML summaries of the # directories produced by the "parse_emails" script. @@ -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 @@ -95,14 +95,14 @@ 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 @@ -137,6 +137,7 @@ fi ADJOINT= + TANGLIN= RESTART=0 FAST=0 DVLP=0 @@ -146,6 +147,8 @@ 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` if test "x$FAST" = x0 ; then @@ -162,11 +165,14 @@ 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$TANGLIN" = xtrue ; then + kind="tang-lin" ; order='001' + elif test "x$RESTART" = x0 ; then + kind="forward" ; order='002' else - kind="restart" + kind="restart" ; order='003' fi if test "x$UR4" = x1 ; then OPTFILE="${OPTFILE}.use_r4" @@ -204,7 +210,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 @@ -216,9 +222,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`