/[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.175 by jmc, Wed Aug 15 23:19:21 2012 UTC revision 1.179 by jmc, Thu Aug 23 02:01:27 2012 UTC
# Line 534  makemodel() Line 534  makemodel()
534              mk_fail=2              mk_fail=2
535          fi          fi
536      fi      fi
537        if test $KIND = 1 -a -f taf_ftl.log ; then
538                head -1 taf_ftl.log >> $CDIR"/summary.txt"
539        fi
540      if test $KIND = 2 -a -f taf_ad.log ; then      if test $KIND = 2 -a -f taf_ad.log ; then
541              head -1 taf_ad.log >> $CDIR"/summary.txt"              head -1 taf_ad.log >> $CDIR"/summary.txt"
542              nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`              nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`
# Line 802  runmodel() Line 805  runmodel()
805            fi            fi
806          fi          fi
807          rm -f run.log_tmp          rm -f run.log_tmp
808          #- in all cases where OutputFile exists, report SIZE (and AD time)          #- in all cases where OutputFile exists, report SIZE and time
809          if test -f $OUTPUTFILE ; then          if test -f $OUTPUTFILE ; then
810            grep '(PID\.TID 0000\.0001)      n.. =' $OUTPUTFILE \            grep '(PID\.TID 0000\.0001)      n.. =' $OUTPUTFILE \
811                  | sed 's/(PID.TID 0000.0001)     //' >> $CDIR"/summary.txt"                  | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
812            if test $KIND = 2 ; then            grep -A3 'Seconds in section "ALL' $OUTPUTFILE \
813              grep -A3 'Seconds in section "ALL' $OUTPUTFILE >> $CDIR"/summary.txt"                  | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
           fi  
814          fi          fi
815          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
816          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
# Line 1278  else Line 1280  else
1280  fi  fi
1281    
1282  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
1283  if test -x tr_cmpnum ; then  if test "x$CLEANUP" = xt -o -x tr_cmpnum ; then
1284      echo "skipping comparison code build"      echo "skipping comparison code build"
1285  else  else
1286      createcodelet      createcodelet
# Line 1342  if test "x$OPTFILE" != xNONE ; then Line 1344  if test "x$OPTFILE" != xNONE ; then
1344          echo >> $SUMMARY          echo >> $SUMMARY
1345          echo "  OPTFILE=$OPTFILE" >> $SUMMARY          echo "  OPTFILE=$OPTFILE" >> $SUMMARY
1346      else      else
1347          echo | tee $SUMMARY          echo | tee -a $SUMMARY
1348          echo "ERROR: can't read OPTFILE=\"$OPTFILE\"" | tee $SUMMARY          echo "ERROR: can't read OPTFILE=\"$OPTFILE\"" | tee -a $SUMMARY
1349          exit 1          exit 1
1350      fi      fi
1351  else  else
# Line 1382  else Line 1384  else
1384      line_4="2 d e n  t  r  r"      line_4="2 d e n  t  r  r"
1385      echo >> $SUMMARY      echo >> $SUMMARY
1386  fi  fi
1387    if test "x$CLEANUP" != xt ; then
1388      echo "$line_0" | tee -a $SUMMARY      echo "$line_0" | tee -a $SUMMARY
1389      echo "$line_1" | tee -a $SUMMARY      echo "$line_1" | tee -a $SUMMARY
1390      echo "$line_2" | tee -a $SUMMARY      echo "$line_2" | tee -a $SUMMARY
1391      echo "$line_3" | tee -a $SUMMARY      echo "$line_3" | tee -a $SUMMARY
1392      echo "$line_4" | tee -a $SUMMARY      echo "$line_4" | tee -a $SUMMARY
1393      echo ""        | tee -a $SUMMARY      echo ""        | tee -a $SUMMARY
1394    fi
1395  echo "-------------------------------------------------------------------------------"  echo "-------------------------------------------------------------------------------"
1396    
1397  #  ...and each test directory...  #  ...and each test directory...
# Line 1597  for dir in $TESTDIRS ; do Line 1601  for dir in $TESTDIRS ; do
1601              fi              fi
1602          done          done
1603    
1604      if test -f $DRESULTS"/"genmake_state ; then : ; else      if test ! -f $DRESULTS"/"genmake_state ; then
1605          if test -f $dir/$builddir/Makefile ; then          if test -f $dir/$builddir/Makefile ; then
1606              mkOpt=`grep '^# OPTFILE=' $dir/$builddir/Makefile 2>/dev/null | head -1 | sed 's/^# //'`              mkOpt=`grep '^# OPTFILE=' $dir/$builddir/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
1607              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
# Line 1606  for dir in $TESTDIRS ; do Line 1610  for dir in $TESTDIRS ; do
1610              if test "x$OPTFILE" = xNONE ; then              if test "x$OPTFILE" = xNONE ; then
1611                  eval $mkOpt                  eval $mkOpt
1612                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\
1613                          $SUMMARY > tr_0.tmp_log                          $SUMMARY > tmp.tr_log
1614                  RETVAL=$?                  RETVAL=$?
1615                  if test "x$RETVAL" = x0 ; then rm -f $SUMMARY                  if test "x$RETVAL" = x0 ; then rm -f $SUMMARY
1616                          cp tr_0.tmp_log $SUMMARY                          cp tmp.tr_log $SUMMARY
1617                  else rm -f tr_0.tmp_log                  else rm -f tmp.tr_log
1618                  fi                  fi
1619              fi              fi
1620              gmkLog=$dir/$builddir/genmake.log              gmkLog=$dir/$builddir/genmake.log
1621              grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1              if test -r $gmkLog ; then
1622              RETVAL=$?                  grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1
1623              if test "x$RETVAL" = x0 ; then                  RETVAL=$?
1624                  echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state                  if test "x$RETVAL" = x0 ; then
1625                  sed -n '/Get compiler version/,/<-- compiler version/p' $gmkLog \                    echo -n "from '$gmkLog', " >> $DRESULTS/genmake_state
1626                          | grep -v '^... compiler version ' > tr_1.tmp_log                    echo "extract compiler version:"   >> $DRESULTS/genmake_state
1627                  sed -n '1p' tr_1.tmp_log >> $DRESULTS/genmake_state                    sed -n '/Get compiler version/,/<-- compiler version/p' \
1628                  sed -n '2,/^$/p' tr_1.tmp_log | sed '/^$/d' | sed 's/^./ &/' \                       $gmkLog | grep -v '^... compiler version ' > tmp.tr_log
1629                          >> $DRESULTS/genmake_state                    sed -n '1p' tmp.tr_log >> $DRESULTS/genmake_state
1630                  rm -f tr_1.tmp_log                    sed -n '2,/^$/p' tmp.tr_log | sed '/^$/d' | sed 's/^./ &/' \
1631                                             >> $DRESULTS/genmake_state
1632                      rm -f tmp.tr_log
1633                    fi
1634                    echo -n "from '$gmkLog', " >> $DRESULTS/genmake_state
1635                    echo "get NETCDF & LAPACK settings:" >> $DRESULTS/genmake_state
1636                    sed -n '/set HAVE_NETCDF=/p' $gmkLog >> $DRESULTS/genmake_state
1637                    sed -n '/set HAVE_LAPACK=/p' $gmkLog >> $DRESULTS/genmake_state
1638              fi              fi
1639          fi          fi
1640      fi      fi
# Line 1685  fi Line 1696  fi
1696  if test "x$DELDIR" = xt ; then  if test "x$DELDIR" = xt ; then
1697      rm -rf $DRESULTS      rm -rf $DRESULTS
1698  fi  fi
1699    echo "======== End of testreport execution ========"

Legend:
Removed from v.1.175  
changed lines
  Added in v.1.179

  ViewVC Help
Powered by ViewVC 1.1.22