--- MITgcm/verification/testreport 2007/01/10 22:50:09 1.89 +++ MITgcm/verification/testreport 2007/01/31 21:28:34 1.90 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.89 2007/01/10 22:50:09 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.90 2007/01/31 21:28:34 ce107 Exp $ # $Name: $ # @@ -37,11 +37,14 @@ echo " (DEF=\"1 2 3 4 5\")" echo " (-j) JOBS use \"make -j JOBS\" for parallel builds" echo " (-clean) *ONLY* run \"make CLEAN\"" - echo " (-q|-quick) same as \"-nogenmake -noclean -nodepend\"" - echo " (-ng|-nogenmake) skip the genmake stage" - echo " (-nc|-noclean) skip the \"make clean\" stage" - echo " (-nd|-nodepend) skip the \"make depend\" stage" - echo " (-dd|-deldir) on success, delete the output directory" + echo " (-quick|-q) same as \"-nogenmake -noclean -nodepend\"" + echo " (-nogenmake|-ng) skip the genmake stage" + echo " (-noclean|-nc) skip the \"make clean\" stage" + echo " (-nodepend|-nd) skip the \"make depend\" stage" + echo " (-deldir|-dd) on success, delete the output directory" + echo " (-ts) provide timing information per timestep" + echo " (-papis) provide MFlop/s per timestep using PAPI" + echo " (-pcls) provide MFlop/s per timestep using PCL" echo echo "and where STRING can be a whitespace-delimited list" echo "such as:" @@ -318,6 +321,16 @@ if test "x$MPI" = xt ; then command="$command -mpi" fi + if test "x$TS" = xt ; then + command="$command -ts" + fi + if test "x$PAPIS" = xt ; then + command="$command -papis" + else + if test "x$PCLS" = xt ; then + command="$command -pcls" + fi + fi printf 'genmake ... ' 1>&2 $command > make.log 2>&1 RETVAL=$? @@ -811,6 +824,12 @@ -deldir | -dd) DELDIR=t ;; + -ts) TS=t;; + + -papis) PAPIS=t;; + + -pcls) PCL=t;; + -*) echo "Error: unrecognized option: "$ac_option usage