/[MITgcm]/MITgcm/verification/testreport
ViewVC logotype

Diff of /MITgcm/verification/testreport

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.73 by jmc, Sat Dec 3 23:23:41 2005 UTC revision 1.77 by jmc, Mon Mar 20 21:50:36 2006 UTC
# Line 515  runmodel() Line 515  runmodel()
515      #  (where "$COMMAND" is relative to "directory")      #  (where "$COMMAND" is relative to "directory")
516      (      (
517          cd $1          cd $1
518          printf 'runmodel ... ' 1>&2          printf 'runmodel in %s ...' $1 1>&2
519          # make output.txt          # make output.txt
520          echo          echo
521          rm -f run.log          rm -f run.log
522            if test $OUTPUTFILE -ot $EXECUTABLE ; then
523               ( eval $COMMAND ) > run.log 2>&1
524               RETVAL=$?
525            else
526               echo " $OUTPUTFILE is up to date " > run.log 2>&1
527               RETVAL=0
528            fi
529          # echo "COMMAND='$COMMAND'"          # echo "COMMAND='$COMMAND'"
530          # echo "pwd='"`pwd`"'"          # echo "pwd='"`pwd`"'"
         ( eval $COMMAND ) > run.log 2>&1  
         RETVAL=$?  
531          if test "x$RETVAL" = x0 ; then          if test "x$RETVAL" = x0 ; then
532              tail run.log              tail run.log
533              echo successful 1>&2              echo successful 1>&2
# Line 806  if test "x$OPTFILE" = xNONE -a "x$MITGCM Line 811  if test "x$OPTFILE" = xNONE -a "x$MITGCM
811      OPTFILE=$MITGCM_OF      OPTFILE=$MITGCM_OF
812  fi  fi
813    
814    if test "x$ADM" = xt ; then
815        EXECUTABLE="mitgcmuv_ad"
816        OUTPUTFILE="output.txt_adm"
817    else
818        EXECUTABLE="mitgcmuv"
819        OUTPUTFILE="output.txt"
820    fi
821    
822  if test "x$ADM" = xt -a "x$COMMAND" = x ; then  if test "x$ADM" = xt -a "x$COMMAND" = x ; then
823      COMMAND="./mitgcmuv_ad > output.txt_adm 2>&1"      COMMAND="./$EXECUTABLE > $OUTPUTFILE"
824  fi  fi
825    
826  if test "x$COMMAND" = x ; then  if test "x$COMMAND" = x ; then
827      COMMAND="$MAKE output.txt"      COMMAND="./$EXECUTABLE > $OUTPUTFILE"
828  fi  fi
829    
830  echo "OK"  #echo "OK"
831    echo "OK (COMMAND= $COMMAND )"
832    
833  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
834  createcodelet  createcodelet
# Line 1048  for dir in $TESTDIRS ; do Line 1062  for dir in $TESTDIRS ; do
1062              done              done
1063              ldir=build              ldir=build
1064              (              (
1065                  cd "$dir/$ldir" > /dev/null 2>&1                  cd $dir/tr_run.$ex
1066                  ls -1 Makefile *.[fFhco] mitgcmuv  2>/dev/null \                  test ! -e mitgcmuv  &&  ln -s "../"$ldir"/"mitgcmuv .
                     | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'  
             ) > tr_exrun_links  
             (  
                 cd "$dir/tr_run.$ex"  
                     cat ../../tr_exrun_links | while read i ; do  
                         if test ! "x$i" = x ; then  
                             test ! -r $i  &&  ln -s "../"$ldir"/"$i $i  
                         fi  
                     done  
1067              )              )
             test -e tr_exrun_links  &&  rm -f tr_exrun_links  
1068              runmodel $dir/tr_run.$ex && run=Y \              runmodel $dir/tr_run.$ex && run=Y \
1069                  && results=`testoutput $dir tr_run.$ex "."$ex`                  && results=`testoutput $dir tr_run.$ex "."$ex`
1070              fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`              fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
# Line 1084  for dir in $TESTDIRS ; do Line 1088  for dir in $TESTDIRS ; do
1088          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1089          echo "DATE='$DATE'" >> $CDIR"/summary.txt"          echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1090          echo "tdir='$dir'" >> $CDIR"/summary.txt"          echo "tdir='$dir'" >> $CDIR"/summary.txt"
1091            grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
1092                               >> $CDIR"/summary.txt"
1093      fi      fi
1094    
1095      postclean $dir/$builddir      postclean $dir/$builddir

Legend:
Removed from v.1.73  
changed lines
  Added in v.1.77

  ViewVC Help
Powered by ViewVC 1.1.22