--- mitgcm.org/scripts/check_outp 2009/06/17 21:01:44 1.12 +++ mitgcm.org/scripts/check_outp 2009/07/07 23:32:02 1.15 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.12 2009/06/17 21:01:44 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.15 2009/07/07 23:32:02 jmc Exp $ # # The purpose of this script is to compare # the latest output with the previous one (from the same platform with @@ -178,9 +178,9 @@ ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all if test "x$MACHINES" = "x_All_" ; then - MACHINES="faulks aces eddy bay meander lagoon hugo" - MACHINES="$MACHINES columbia edvir rays solasrv sx8 xd1" - MACHINES="$MACHINES beagle batsi starp" + MACHINES="faulks meander lagoon harbor dickens danton aces" + MACHINES="$MACHINES beagle columbia edvir rays solasrv sx8 xd1" + MACHINES="$MACHINES bigred starp" MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq` for madd in $MALL ; do @@ -251,8 +251,8 @@ 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` - MTH=`grep -c "^run: .*testreport.* -mth " $dir/summary.txt` + NOI3E=`grep -c "^run: .*testreport.* '*-noieee'*" $dir/summary.txt` + MTH=`grep -c "^run: .*testreport.* -mth" $dir/summary.txt` fi if test "x$RESTART" = x0 ; then kind="forward" @@ -260,13 +260,13 @@ else kind="restart" fi - if test "x$NOI3E" = x1 ; then - OPTFILE="${OPTFILE}.noieee" - fi if test "x$MTH" = x1 ; then - yy=`echo $OPTFILE | grep -c 'mth$'` + 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" + 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]$//'` day=`echo $ttt | sed -e 's|_| |g' |awk '{print $NF}'` @@ -310,10 +310,10 @@ num=`grep -c "^$key" ./plist` #- discard unsafe test: dd=`echo $optf | grep -c 'gfortran.*mth'` - if test $mname = 'lagoon' -a $dd = 1 ; then num=-1 ; fi - if test $mname = 'harbor' -a $dd = 1 ; then num=-1 ; fi - 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 + #if test $mname = 'lagoon' -a $dd = 1 ; then num=-1 ; fi + #if test $mname = 'harbor' -a $dd = 1 ; then num=-1 ; fi + #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 if test $num -gt 0 ; then pline=`grep "^$key " ./plist | head -1` if test $dBug = 't' ; then