--- mitgcm.org/front_content/make_summary 2006/04/28 14:41:00 1.29 +++ mitgcm.org/front_content/make_summary 2007/12/25 22:01:48 1.34 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.29 2006/04/28 14:41:00 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.34 2007/12/25 22:01:48 jmc Exp $ # # The purpose of this script is to create HTML summaries of the # directories produced by the "parse_emails" script. @@ -19,89 +19,6 @@ exit 1 } -old_summary() -{ - # Create the old-style summary file for $PERIOD - echo -n "Creating the summary file for the period \"$PERIOD\" ... " - cat > $OUTFILE << EOF - - - - - MITgcm testing summary - - - - - - -EOF - - # all_files=`find $INDIR -name summary.txt` - all_files=`( cd $INDIR ; find . -name summary.txt )` - - for f in $all_files ; do - - file=$INDIR"/"${f/.\//} - grep "^fresults" $file > /dev/null 2>&1 - RETVAL=$? - if test "x$RETVAL" != x0 ; then - continue - fi - - url=`echo $file | sed -e 's|/u/edhill/www|http://mitgcm.org/~edhill|'` - url=`echo $url | sed -e 's|summary.txt||'` - MACH= - fresults= - color="#eeeeee" - - source $file - echo $fresults | grep FAIL > /dev/null 2>&1 - if test "x$?" = x0 ; then - color="#ff99ff" - fi - echo $fresults | grep pass > /dev/null 2>&1 - if test "x$?" = x0 ; then - color="#99ffff" - fi - - gm_state=`echo $file | sed -e 's/summary.txt/genmake_state/g'` - if test -r $gm_state ; then - grep '^OPTFILE=' $gm_state > ./tmp_state - source ./tmp_state - else - optfile="unknown" - fi - optfile=`echo $OPTFILE | awk -F '/' '{print $NF}'` - - echo "" >> $OUTFILE - echo "" >> $OUTFILE - echo "" >> $OUTFILE - for i in $fresults ; do - if test "x$i" = xN ; then - echo -n "" >> $OUTFILE - else - echo -n "" >> $OUTFILE - fi - done - echo "" >> $OUTFILE - echo "" >> $OUTFILE - - done - - cat >> $OUTFILE << EOF - -
$MACH$DATE$i$i$optfile
- - -EOF - - chmod a+r $OUTFILE - echo "done" -} - - # defaults PERIOD=`date +%Y`"_"`date +%m` @@ -176,16 +93,18 @@ Notes Intel P4 "faulks" - Fedora Core 3 - Intel P4 "hemmingway" - Fedora Core 3 + Fedora Core 6 + Intel P4 "eddy" + Fedora Core 5 + + + Intel P4 Mosix Cluster "sea" + Fedora Core 6 - Intel P4 "eddy" - Fedora Core 5 AMD Opteron cluster "dolphin" SuSE SLES v8.1 @@ -232,9 +152,6 @@ @@ -262,11 +179,11 @@ ncolor="#bbddff" res_url="http://mitgcm.org/testing/" -MACHINES="faulks shelley myrinet eaps halem columbia two" -MACHINES="$MACHINES hopper lomax turing orion bf bs slough sea" -MACHINES="$MACHINES eddy adams dolphin hemmingway altix350 edvir" +MACHINES="faulks aces eddy bay meander" +MACHINES="$MACHINES edvir rays1 model columbia" +MACHINES="$MACHINES xd1 batsi starp" -( cd $INDIR ; ls -1 -t ) > ./dir_all +( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq` for madd in $MALL ; do @@ -312,40 +229,27 @@ fi ADJOINT= + RESTART=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` fi - if test "x$ADJOINT" = x ; then + if test "x$RESTART" = x0 ; then kind="forward" - else test "x$ADJOINT" = xtrue && kind="adjoint" + else + kind="restart" fi t_pass="--" t_tot="--" if test -r $dir/summary.txt ; then - grep '^[YN] [YN] [YN] [YN] ' $dir/summary.txt > ./all_tests 2>/dev/null + grep '^[YN] [YN] [YN] [YN]' $dir/summary.txt > ./all_tests 2>/dev/null t_tot=`cat ./all_tests | wc -l | sed -e 's| ||g'` - grep '^Y Y Y Y ' ./all_tests > ./all_ran 2>/dev/null - grep advect_ ./all_ran 2>/dev/null > ./all_ran_advect - t_advect=`cat ./all_ran_advect | wc -l | sed -e 's| ||g'` - digits=`cat ./all_ran_advect | awk '{print $9}'` - t_advect_pass=0 - for k in $digits ; do - test "x$k" = x-- && k=0 - test $k -ge 9 && t_advect_pass=$(( $t_advect_pass + 1 )) - done - grep -v advect ./all_ran 2>/dev/null > ./all_ran_noadvect - digits=`cat ./all_ran_noadvect | awk '{print $5}'` - t_sum=0 - for k in $digits ; do - test "x$k" = x-- && k=0 - test $k -ge 9 && t_sum=$(( $t_sum + 1 )) - done - t_pass=$(( $t_sum + $t_advect_pass )) + t_pass=`grep 'pass ' ./all_tests | wc -l | sed -e 's| ||g'` fi - rm -f ./all_tests ./all_ran ./all_ran_advect ./all_ran_noadvect + rm -f ./all_tests # echo "${dir##*/} : $t_pass out of $t_tot" tokens=`echo $i | sed -e 's|_| |g'`