--- mitgcm.org/front_content/make_summary 2011/06/28 18:31:20 1.66 +++ 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.66 2011/06/28 18:31:20 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,7 +85,7 @@ color="#bbffdd" ncolor="#bbddff" -MACHINES="faulks meander aces 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" @@ -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 @@ -139,6 +140,7 @@ RESTART=0 FAST=0 DVLP=0 + MPI=0 MTH=0 UR4=0 if test -r $dir/summary.txt ; then @@ -150,6 +152,10 @@ 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 @@ -165,6 +171,10 @@ 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 @@ -222,7 +232,7 @@ URL="results/$PERIOD/$ldir" cat <>$OUTFILE - $mname + $sname $optf $kind $DAY