--- mitgcm.org/scripts/check_outp 2011/01/21 19:45:01 1.27 +++ mitgcm.org/scripts/check_outp 2011/08/09 16:40:29 1.29 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.27 2011/01/21 19:45:01 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.29 2011/08/09 16:40:29 jmc Exp $ # # The purpose of this script is to compare # the latest output with the previous one (from the same platform with @@ -102,13 +102,18 @@ ADJOINT= RESTART=0 - NOI3E=0 + FAST=0 + DVLP=0 MTH=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` MTH=`grep -c "^run: .*testreport.* -mth" $dir/summary.txt` fi if test "x$RESTART" = x0 ; then @@ -121,8 +126,11 @@ 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 day=`echo $i | sed -e 's/_[0-9]$//' | sed -e 's/_[0-9][0-9]$//'` ttt=`echo $day | sed -e 's/_[0-9]$//' | sed -e 's/_[0-9][0-9]$//'` @@ -296,7 +304,7 @@ ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all if test "x$MACHINES" = "x_All_" ; then - MACHINES="faulks meander aces.jmc aces.ce107 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" @@ -317,6 +325,7 @@ for pname in $MACHINES ; do + sname=`echo $pname | sed 's/-$//'` mname=`echo $pname | sed 's/\./ /g' | awk '{print $1}'` sUser= if test $mname != $pname ; then @@ -362,7 +371,7 @@ #if test $mname = 'aces' -a $optf = 'linux_ia32_open64' ; then num=-1 ; fi #if test $mname = 'aces' -a $optf = 'linux_ia32_g95' ; then num=-1 ; fi dd=`echo $optf | grep -c 'bigred.*noieee'` - if test $mname = 'bigred' -a $dd = 1 ; then num=-1 ; fi + #if test $mname = 'bigred' -a $dd = 1 ; then num=-1 ; fi if test $num -lt 0 ; then echo " discard $sdir : $type , of='$optf'" | tee -a $OUTPFIL cmis=`expr $cmis + 1` @@ -443,7 +452,7 @@ fi done if [ $cmis -gt 0 ] ; then tmis='(-'$cmis')' ; else tmis='(--)' ; fi - printf '%11s : %3i %4s %3i ' $pname $ctot $tmis $cdif >> $OUTPSUM + printf '%11s : %3i %4s %3i ' $sname $ctot $tmis $cdif >> $OUTPSUM if [ $cdif -gt 0 ] ; then echo " $clin" >> $OUTPSUM else echo "" >> $OUTPSUM ; fi