--- mitgcm.org/front_content/make_summary 2010/03/05 20:18:54 1.62 +++ mitgcm.org/front_content/make_summary 2011/08/19 20:38:19 1.69 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.62 2010/03/05 20:18:54 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.69 2011/08/19 20:38:19 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 } @@ -85,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 @@ -107,6 +107,7 @@ for mname in $MACHINES ; do echo " $mname" + sname=`echo $mname | sed 's/-$//'` dir_list=`grep $mname ./dir_all` echo -n "" > ./mlist @@ -137,14 +138,24 @@ 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` UR4=`grep -c "^run: .*testreport.* -use_r4 " $dir/summary.txt` if test "x$UR4" = x0 ; then @@ -160,12 +171,19 @@ 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="--" @@ -214,7 +232,7 @@ URL="results/$PERIOD/$ldir" cat <>$OUTFILE - $mname + $sname $optf $kind $DAY