/[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.75 by jmc, Fri Feb 24 23:15:25 2006 UTC revision 1.78 by jmc, Mon May 22 00:14:29 2006 UTC
# Line 181  dashnum() Line 181  dashnum()
181    
182  testoutput_ad()  testoutput_ad()
183  {  {
184      grep $3 $1/results_ad/output.txt_adm | awk '{print NR " " $5}' > t05.txt      grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt
185      grep $3 $1/$2/output.txt_adm | awk '{print NR " " $5}' > t15.txt      grep $3 $1/$2/output_adm.txt | awk '{print NR " " $5}' > t15.txt
186      grep $3 $1/results_ad/output.txt_adm | awk '{print NR " " $6}' > t06.txt      grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt
187      grep $3 $1/$2/output.txt_adm | awk '{print NR " " $6}' > t16.txt      grep $3 $1/$2/output_adm.txt | awk '{print NR " " $6}' > t16.txt
188      join t05.txt t15.txt > t5.txt      join t05.txt t15.txt > t5.txt
189      join t06.txt t16.txt > t6.txt      join t06.txt t16.txt > t6.txt
190      echo "-1" >> t5.txt      echo "-1" >> t5.txt
# Line 519  runmodel() Line 519  runmodel()
519          # make output.txt          # make output.txt
520          echo          echo
521          rm -f run.log          rm -f run.log
522          if test output.txt -ot mitgcmuv ; then          if test $OUTPUTFILE -ot $EXECUTABLE ; then
523             ( eval $COMMAND ) > run.log 2>&1             ( eval $COMMAND ) > run.log 2>&1
524             RETVAL=$?             RETVAL=$?
525          else          else
526             echo ' output.txt is up to date ' > run.log 2>&1             echo " $OUTPUTFILE is up to date " > run.log 2>&1
527             RETVAL=0             RETVAL=0
528          fi          fi
529          # echo "COMMAND='$COMMAND'"          # echo "COMMAND='$COMMAND'"
# Line 535  runmodel() Line 535  runmodel()
535              # if test "x$ADM" = x ; then              # if test "x$ADM" = x ; then
536              #   cp output.txt $CDIR"/output.txt"              #   cp output.txt $CDIR"/output.txt"
537              # else              # else
538              #   cp output.txt_adm $CDIR"/output.txt_adm"              #   cp output_adm.txt $CDIR"/output_adm.txt"
539              # fi              # fi
540              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
541              return 0              return 0
# Line 811  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_adm.txt"
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="./mitgcmuv > 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 941  for dir in $TESTDIRS ; do Line 950  for dir in $TESTDIRS ; do
950      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
951          fout=$dir"/results/output.txt"          fout=$dir"/results/output.txt"
952      else      else
953          fout=$dir"/results_ad/output.txt_adm"          fout=$dir"/results_ad/output_adm.txt"
954      fi      fi
955      if test ! -r $fout ; then      if test ! -r $fout ; then
956          echo "can't read \"$fout\" -- skipping $dir"          echo "can't read \"$fout\" -- skipping $dir"
# Line 1079  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.75  
changed lines
  Added in v.1.78
  ViewVC Help
Powered by ViewVC 1.1.22