--- mitgcm.org/scripts/check_outp 2008/08/27 21:19:32 1.1 +++ mitgcm.org/scripts/check_outp 2008/09/11 16:10:00 1.4 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.1 2008/08/27 21:19:32 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.4 2008/09/11 16:10:00 jmc Exp $ # # The purpose of this script is to compare # the latest output with the previous one (from the same platform with @@ -166,7 +166,7 @@ if test "x$MACHINES" = "x_All_" ; then MACHINES="faulks aces eddy bay meander lagoon hugo" - MACHINES="$MACHINES columbia edvir rays sx8 xd1" + MACHINES="$MACHINES columbia edvir rays solasrv sx8 xd1" MACHINES="$MACHINES beagle batsi starp" MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq` @@ -198,7 +198,7 @@ if test $n == 2 ; then num2=`expr $num1 \* $n` if [ $num0 -lt $num2 ] ; then - dir_list=`( cd $INDIR ; ls -1 -t ../$PREV_P/*${mname}*/summary.txt | sed 's/\/summary.txt//' )` + dir_list=`( cd $INDIR ; ls -1 -t ../$PREV_P/*${mname}*/summary.txt 2> /dev/null | sed 's/\/summary.txt//' )` #echo "dir_list='$dir_list'" fi else @@ -237,7 +237,7 @@ 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` + NOI3E=`grep -c "^run: .*testreport .* '*-noieee'* " $dir/summary.txt` fi if test "x$RESTART" = x0 ; then kind="forward" @@ -301,9 +301,11 @@ pdir=`echo $pline | cut -d " " -f 5` outs="$INDIR/$sdir/summary.txt" sed -n "5,$ p" $outs | sed '/^[YN] [YN] [YN] [YN]/ s/ \. //g' \ + | sed 's/ OPTFILE=.*\// OPTFILE=/g' \ | grep -v '^[A-S][a-t]* time: ' > tmpfs outp="$INDIR/$pdir/summary.txt" sed -n "5,$ p" $outp | sed '/^[YN] [YN] [YN] [YN]/ s/ \. //g' \ + | sed 's/ OPTFILE=.*\// OPTFILE=/g' \ | grep -v '^[A-S][a-t]* time: ' > tmpfp echo -n "=== diff $sdir $pdir :" | tee -a $OUTPFIL diff tmpfs tmpfp > tmpdf