/[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.77 by jmc, Mon Mar 20 21:50:36 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 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 813  fi Line 813  fi
813    
814  if test "x$ADM" = xt ; then  if test "x$ADM" = xt ; then
815      EXECUTABLE="mitgcmuv_ad"      EXECUTABLE="mitgcmuv_ad"
816      OUTPUTFILE="output.txt_adm"      OUTPUTFILE="output_adm.txt"
817  else  else
818      EXECUTABLE="mitgcmuv"      EXECUTABLE="mitgcmuv"
819      OUTPUTFILE="output.txt"      OUTPUTFILE="output.txt"
# Line 950  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"

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

  ViewVC Help
Powered by ViewVC 1.1.22