--- mitgcm.org/scripts/check_outp 2011/08/23 18:14:10 1.31 +++ mitgcm.org/scripts/check_outp 2012/08/16 02:48:24 1.32 @@ -1,12 +1,11 @@ #! /usr/bin/env bash -# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.31 2011/08/23 18:14:10 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.32 2012/08/16 02:48:24 jmc Exp $ # # The purpose of this script is to compare # the latest output with the previous one (from the same platform with # same optfile) - usage() { echo @@ -101,6 +100,7 @@ fi ADJOINT= + TANGLIN= RESTART=0 FAST=0 DVLP=0 @@ -110,6 +110,8 @@ if test -r $dir/summary.txt ; then comm=`grep 'ADJOINT=true' $dir/summary.txt 2>/dev/null` eval $comm + comm=`grep 'TANGLIN=true' $dir/summary.txt 2>/dev/null` + eval $comm RESTART=`grep -c 'test 2+2=4 summary' $dir/summary.txt` FAST=`grep -c "^run: .*testreport.* '*-fast'*" $dir/summary.txt` if test "x$FAST" = x0 ; then @@ -128,10 +130,12 @@ fi if test "x$ADJOINT" = xtrue ; then kind="adjoint" ; order='000' + elif test "x$TANGLIN" = xtrue ; then + kind="tanglin" ; order='001' elif test "x$RESTART" = x0 ; then - kind="forward" ; order='001' + kind="forward" ; order='002' else - kind="restart" ; order='002' + kind="restart" ; order='003' fi if test "x$UR4" = x1 ; then OPTFILE="${OPTFILE}.use_r4" @@ -154,7 +158,7 @@ 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}'` - if [ $day -lt $BEFORE ] ; then + if [ $day -lt $BEFORE ] ; then echo "$OPTFILE$order $day $OPTFILE $kind $i" >> ./plist elif [ $day -ge $FIRSTDAY -a $day -le $LASTDAY ] ; then echo "$OPTFILE$order $day $OPTFILE $kind $i" >> ./slist @@ -203,9 +207,9 @@ # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue + eval "$ac_prev=\$ac_option" + ac_prev= + continue fi ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`