/[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.99 by jmc, Sat Sep 15 20:30:05 2007 UTC revision 1.100 by jmc, Mon Sep 17 15:35:46 2007 UTC
# Line 108  testoutput_var() Line 108  testoutput_var()
108      if [ -r $1/$4/$OUTPUTFILE ]; then      if [ -r $1/$4/$OUTPUTFILE ]; then
109          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt
110          lncntA=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l tmp1.txt | awk '{print $1}' `
111          if [ $lncntA -lt 3 ]; then          if [ $lncntA -lt 2 ]; then
112              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
113                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
114              fi              fi
# Line 123  testoutput_var() Line 123  testoutput_var()
123      fi      fi
124      grep "$2" $1/results/$5 | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/results/$5 | sed 's/.*=//' | cat -n > tmp2.txt
125      lncntB=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l tmp2.txt | awk '{print $1}' `
126      if [ $lncntB -lt 3 ]; then      if [ $lncntB -lt 2 ]; then
127          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
128              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
129          fi          fi
# Line 235  testoutput_run() Line 235  testoutput_run()
235      # testoutput_run directory subdir reference_output      # testoutput_run directory subdir reference_output
236      #      #
237      #  test output from 1 run in "directory"      #  test output from 1 run in "directory"
238      if test "x$ADM" = x ; then  #   if test "x$ADM" = x ; then
239          # default list of output variables to be checked:          # default list of output variables to be checked:
240          #  1rst : main variable used to decide if it pass or FAIL          #  1rst : main variable used to decide if it pass or FAIL
241          #  others : number of matching digits to be printed in summary.txt          #  others : number of matching digits to be printed in summary.txt
# Line 313  testoutput_run() Line 313  testoutput_run()
313            echo $allargs            echo $allargs
314          fi          fi
315    
316      else  #   else
317          testoutput_ad $1 $2 "precision_grdchk_result"  #       testoutput_ad $1 $2 "precision_grdchk_result"
318      fi  #   fi
319  }  }
320    
321  genmakemodel()  genmakemodel()
# Line 911  else Line 911  else
911  fi  fi
912    
913  if test "x$TESTDIRS" = x ; then  if test "x$TESTDIRS" = x ; then
914      if test "x$ADM" = xt ; then  #   if test "x$ADM" = xt ; then
915          LIST=`scandirs results_ad/$ref_outp`  #       LIST=`scandirs results_ad/$ref_outp`
916      else  #   else
917          LIST=`scandirs results/$ref_outp`          LIST=`scandirs results/$ref_outp`
918      fi  #   fi
919  else  else
920      #- expand group of experiments:      #- expand group of experiments:
921      LIST=" "      LIST=" "
# Line 1077  if test "x$ADM" = x ; then Line 1077  if test "x$ADM" = x ; then
1077  else  else
1078      echo "ADJOINT=true" >> $SUMMARY      echo "ADJOINT=true" >> $SUMMARY
1079      echo >> $SUMMARY      echo >> $SUMMARY
1080        if [ $MATCH_CRIT -lt 10 ] ;
1081        then line_0="default  "$MATCH_CRIT ;
1082        else line_0="default "$MATCH_CRIT ; fi
1083        echo "$line_0" | tee -a $SUMMARY
1084      cat << EOF | tee -a $SUMMARY      cat << EOF | tee -a $SUMMARY
1085  G D M    C  G  G D M    C  G
1086  E p a R  o  r  E p a R  o  r
# Line 1196  for dir in $TESTDIRS ; do Line 1200  for dir in $TESTDIRS ; do
1200      fi      fi
1201            
1202      echo      echo
1203      if test "x$ADM" = x ; then  #   if test "x$ADM" = x ; then
1204          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1205          echo          echo
1206          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1207          touch $CDIR"/summary.txt"          touch $CDIR"/summary.txt"
1208          echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"          echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"
1209          echo "MACH='$MACH'" >> $CDIR"/summary.txt"          echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1210          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
# Line 1222  for dir in $TESTDIRS ; do Line 1226  for dir in $TESTDIRS ; do
1226              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1227              fres="$fres.$ex"              fres="$fres.$ex"
1228              echo              echo
1229              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1230              touch $CDIR"/summary.txt"              touch $CDIR"/summary.txt"
1231              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"
1232              echo "MACH='$MACH'" >> $CDIR"/summary.txt"              echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1233              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1234              echo "DATE='$DATE'" >> $CDIR"/summary.txt"              echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1235              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"
1236              if test "x$POSTCLEAN" = xt ; then              if test "x$POSTCLEAN" = xt ; then
1237                  run_clean $dir/tr_run.$ex                  run_clean $dir/tr_run.$ex
1238              fi              fi
1239          done          done
1240      else  #   else
1241          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}`
1242          fres=$fres"$results   $dir"  #       fres=$fres"$results   $dir"
1243          echo  #       echo
1244          echo "$fres" >> $SUMMARY  #       echo "$fres" >> $SUMMARY
1245          touch $CDIR"/summary.txt"  #       touch $CDIR"/summary.txt"
1246          echo "fresults='$fres'" >> $CDIR"/summary.txt"  #       echo "fresults='$fres'" >> $CDIR"/summary.txt"
1247          echo "MACH='$MACH'" >> $CDIR"/summary.txt"  #       echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1248          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"  #       echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1249          echo "DATE='$DATE'" >> $CDIR"/summary.txt"  #       echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1250          echo "tdir='$dir'" >> $CDIR"/summary.txt"  #       echo "tdir='$dir'" >> $CDIR"/summary.txt"
1251      fi  #   fi
1252      if test "x$ADM" = xt ; then      if test "x$ADM" = xt ; then
1253          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
1254                             >> $CDIR"/summary.txt"                             >> $CDIR"/summary.txt"
1255      fi      fi
1256    

Legend:
Removed from v.1.99  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.22