--- mitgcm.org/scripts/check_outp 2008/09/09 18:09:37 1.3 +++ mitgcm.org/scripts/check_outp 2009/04/06 18:12:34 1.6 @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.3 2008/09/09 18:09:37 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.6 2009/04/06 18:12:34 jmc Exp $ # # The purpose of this script is to compare # the latest output with the previous one (from the same platform with @@ -18,6 +18,7 @@ echo " (-l |-list )MACHINES check platforms from this list" echo " [def=\"$MACHINES\"]" echo " (-d |-day )FIRSTDAY select output from day=\"YYYYMMDD\"" + echo " (argument of \"date -d\" is allowed)" echo " [def=\"$FIRSTDAY\"]" echo " (-u |-upto )LASTDAY until last day=\"YYYYMMDD\" (=selected period)" echo " [def=\"FIRSTDAY\"]" @@ -101,6 +102,16 @@ esac done +#-- test FIRSTDAY content ; interpret as "date -d" arg. if not YYYYMMDD +ttt=`echo "y$FIRSTDAY" | sed 's/[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/z/'` +if test "x$ttt" != 'xyz' ; then + FIRSTDAY=`date -d "$FIRSTDAY" +%Y%m%d` +fi +ttt=`echo "y$FIRSTDAY" | sed 's/[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/z/'` +if test "x$ttt" != 'xyz' ; then + echo "Error: FIRSTDAY='$FIRSDAY' not recognized" + exit 2 +fi if test $LASTDAY = "30000000" ; then LASTDAY=$FIRSTDAY ; fi CMDLINE=$0 for xx in "$@" ; do nw=`echo $xx | wc -w` @@ -144,7 +155,7 @@ fi else echo "$INDIR is not a directory" - exit + exit 3 fi #- a short summary of this checking : @@ -291,7 +302,7 @@ num=`grep -c "^$key" ./plist` #- discard unsafe test: dd=`echo $optf | grep -c 'gfortran.*mth'` - if [ $dd -ge 1 ] ; then num=-1 ; fi + #if [ $dd -ge 1 ] ; then num=-1 ; fi if test $num -gt 0 ; then pline=`grep "^$key " ./plist | head -1` if test $dBug = 't' ; then @@ -301,9 +312,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 @@ -373,4 +386,4 @@ fi echo ".. cat $OUTPSUM" cat $OUTPSUM - +exit 0