--- MITgcm/verification/testreport 2007/09/06 22:31:45 1.94 +++ MITgcm/verification/testreport 2008/02/06 21:06:03 1.111 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.94 2007/09/06 22:31:45 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.111 2008/02/06 21:06:03 mlosch Exp $ # $Name: $ # @@ -15,9 +15,10 @@ echo " (-mpi) compile and run using MPI" echo " (-ieee|-noieee) if possible, use IEEE compiler flags" echo " (DEF=\"-ieee\")" + echo " (-gsl) compile with \"-gsl\" flag" echo " (-of=|-optfile=)STRING list of optfiles to use" echo " (-a|-addr) STRING list of email recipients" - echo " (DEF=\"edhill@mitgcm.org\")" + echo " (DEF=\"\" no email is sent)" echo " (-t|-tdir) STRING list of group and/or exp. dirs to test" echo " (recognized groups: basic, tutorials)" echo " (DEF=\"\" which test all)" @@ -96,10 +97,10 @@ testoutput_var() { - # testoutput_var dir s1 label subdir extension + # testoutput_var dir s1 label subdir reference_output # # compares 1 variable output selected from file $dir/$subdir/$OUTPUTFILE - # with same output from reference file $dir/results/output.$extension + # with same output from reference file $dir/results/$reference_output # using search strings s1 and text label if [ $debug -gt 0 ]; then @@ -108,7 +109,7 @@ if [ -r $1/$4/$OUTPUTFILE ]; then grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt lncntA=`wc -l tmp1.txt | awk '{print $1}' ` - if [ $lncntA -lt 3 ]; then + if [ $lncntA -lt 2 ]; then if [ $verbose -gt 0 ]; then echo Not enough lines of output when searching for "$2" 1>&2 fi @@ -119,11 +120,11 @@ return 99 fi if [ $debug -gt 0 ]; then - echo testoutput_var: grep "$2" $1/results/output.$5 1>&2 + echo testoutput_var: grep "$2" $1/results/$5 1>&2 fi - grep "$2" $1/results/output.$5 | sed 's/.*=//' | cat -n > tmp2.txt + grep "$2" $1/results/$5 | sed 's/.*=//' | cat -n > tmp2.txt lncntB=`wc -l tmp2.txt | awk '{print $1}' ` - if [ $lncntB -lt 3 ]; then + if [ $lncntB -lt 2 ]; then if [ $verbose -gt 0 ]; then echo Not enough lines of output when searching for "$2" 1>&2 fi @@ -161,12 +162,12 @@ digits_of_similarity=`./tr_cmpnum < tmp4.txt` if [ $digits_of_similarity -eq 99 ]; then if [ $verbose -gt 0 ]; then - echo testoutput_var: No comparison was available for \"$2\" 1>&2 + echo testoutput_var: No comparison was available for \"$3\" 1>&2 fi digits_of_similarity=99 else if [ $verbose -gt 0 ]; then - echo There were $digits_of_similarity decimal places of similarity for \"$2\" 1>&2 + echo There were $digits_of_similarity decimal places of similarity for \"$3\" 1>&2 fi fi rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt @@ -174,37 +175,6 @@ return $digits_of_similarity } -dashnum() -{ - # dashnum n1 n2 n3 ... - # - # print numbers using %3i format or "--" if number = 99 - - for num in $@ ; do - if [ $num = 99 ]; then - printf ' --' - else - printf '%3i' $num - fi - done -} - -testoutput_ad() -{ - grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt - grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $5}' > t15.txt - grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt - grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $6}' > t16.txt - join t05.txt t15.txt > t5.txt - join t06.txt t16.txt > t6.txt - echo "-1" >> t5.txt - echo "-1" >> t6.txt - digits_5=`./tr_cmpnum < t5.txt` - digits_6=`./tr_cmpnum < t6.txt` - dashnum $digits_5 $digits_6 - rm -f t[01][56].txt t[56].txt -} - check_for_add_mon_output() { # Check for additional types of monitor output @@ -232,21 +202,20 @@ testoutput_run() { - # testoutput_run directory subdir extension + # testoutput_run directory subdir reference_output # # test output from 1 run in "directory" - if test "x$ADM" = x ; then +# --> same processing for adjoint & forward test # default list of output variables to be checked: # 1rst : main variable used to decide if it pass or FAIL # others : number of matching digits to be printed in summary.txt listChk=$DEF_CHECK_LIST - nbDef=`echo $listChk | awk '{print NF-1+3*gsub("+","E")}'` # load experiment-specific list from file "tr_checklist" (if it exist) if test -r $1/$2/tr_checklist ; then listChk=`cat $1/$2/tr_checklist` ; fi sVar=`echo $listChk | awk '{print $1}'` # remove 1rst var and expand the list: + => min max mean s.d - listVar=`echo $listChk | awk '{ for(i=2;i<=NF;i++){if (sub("+","",$i)) \ - {printf " %s %s %s %s",$i"mn",$i"mx",$i"av",$i"sd"} else {printf " %s",$i} }}'` + listVar=`echo $listChk | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' \ + | sed 's/+//g' | sed "s/^$sVar//"` if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(I)='$listVar'" 1>&2 ; fi for ii in 1 2 3 4 5 6 7 8 9 ; do tst=`eval 'echo "$HAVE_PTR0'$ii'"'` @@ -269,24 +238,26 @@ case $xx in 'PS') if [ $debug -gt 0 ] then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi - testoutput_var $1 "cg2d_init_res" "cg2d init. residual" $2 $3; yy=$? + testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $3; yy=$? if [ $debug -gt 0 ] ; then echo testoutput_run: cg2dres=$yy 1>&2 ; fi ;; - 'Tmn') testoutput_var $1 "dynstat_theta_min" "theta minimum" $2 $3; yy=$? ;; - 'Tmx') testoutput_var $1 "dynstat_theta_max" "theta maximum" $2 $3; yy=$? ;; - 'Tav') testoutput_var $1 "dynstat_theta_mean" "theta mean" $2 $3; yy=$? ;; - 'Tsd') testoutput_var $1 "dynstat_theta_sd" "theta s.d." $2 $3; yy=$? ;; - 'Smn') testoutput_var $1 "dynstat_salt_min" "salt minimum" $2 $3; yy=$? ;; - 'Smx') testoutput_var $1 "dynstat_salt_max" "salt maximum" $2 $3; yy=$? ;; - 'Sav') testoutput_var $1 "dynstat_salt_mean" "salt mean" $2 $3; yy=$? ;; - 'Ssd') testoutput_var $1 "dynstat_salt_sd" "salt s.d." $2 $3; yy=$? ;; + 'Cost') testoutput_var $1 "ADM precision_derivative_cost" "ADM Cost" $2 $3; yy=$? ;; + 'Grad') testoutput_var $1 "ADM precision_derivative_grad" "ADM Grad" $2 $3; yy=$? ;; + 'Tmn') testoutput_var $1 "dynstat_theta_min" "Theta minimum" $2 $3; yy=$? ;; + 'Tmx') testoutput_var $1 "dynstat_theta_max" "Theta maximum" $2 $3; yy=$? ;; + 'Tav') testoutput_var $1 "dynstat_theta_mean" "Theta mean" $2 $3; yy=$? ;; + 'Tsd') testoutput_var $1 "dynstat_theta_sd" "Theta Std.Dev" $2 $3; yy=$? ;; + 'Smn') testoutput_var $1 "dynstat_salt_min" "Salt minimum" $2 $3; yy=$? ;; + 'Smx') testoutput_var $1 "dynstat_salt_max" "Salt maximum" $2 $3; yy=$? ;; + 'Sav') testoutput_var $1 "dynstat_salt_mean" "Salt mean" $2 $3; yy=$? ;; + 'Ssd') testoutput_var $1 "dynstat_salt_sd" "Salt Std.Dev" $2 $3; yy=$? ;; 'Umn') testoutput_var $1 "dynstat_uvel_min" "U minimum" $2 $3; yy=$? ;; 'Umx') testoutput_var $1 "dynstat_uvel_max" "U maximum" $2 $3; yy=$? ;; 'Uav') testoutput_var $1 "dynstat_uvel_mean" "U mean" $2 $3; yy=$? ;; - 'Usd') testoutput_var $1 "dynstat_uvel_sd" "U s.d." $2 $3; yy=$? ;; + 'Usd') testoutput_var $1 "dynstat_uvel_sd" "U Std.Dev" $2 $3; yy=$? ;; 'Vmn') testoutput_var $1 "dynstat_vvel_min" "V minimum" $2 $3; yy=$? ;; 'Vmx') testoutput_var $1 "dynstat_vvel_max" "V maximum" $2 $3; yy=$? ;; 'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean" $2 $3; yy=$? ;; - 'Vsd') testoutput_var $1 "dynstat_vvel_sd" "V s.d." $2 $3; yy=$? ;; + 'Vsd') testoutput_var $1 "dynstat_vvel_sd" "V Std.Dev" $2 $3; yy=$? ;; 'pt1mn'|'pt2mn'|'pt3mn'|'pt4mn'|'pt5mn') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'` testoutput_var $1 "trcstat_ptracer0"$ii"_min" "p0"$ii"_min" $2 $3; yy=$? ;; 'pt1mx'|'pt2mx'|'pt3mx'|'pt4mx'|'pt5mx') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'` @@ -294,7 +265,25 @@ 'pt1av'|'pt2av'|'pt3av'|'pt4av'|'pt5av') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'` testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $3; yy=$? ;; 'pt1sd'|'pt2sd'|'pt3sd'|'pt4sd'|'pt5sd') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'` - testoutput_var $1 "trcstat_ptracer0"$ii"_sd" "p0"$ii"_sd" $2 $3; yy=$? ;; + testoutput_var $1 "trcstat_ptracer0"$ii"_sd" "p0"$ii"_StDv" $2 $3; yy=$? ;; + 'Qntmn') testoutput_var $1 "extforcing_qnet_min" "Qnet minimum" $2 $3; yy=$? ;; + 'Qntmx') testoutput_var $1 "extforcing_qnet_max" "Qnet maximum" $2 $3; yy=$? ;; + 'Qntav') testoutput_var $1 "extforcing_qnet_mean" "Qnet mean" $2 $3; yy=$? ;; + 'Qntsd') testoutput_var $1 "extforcing_qnet_sd" "Qnet Std.Dev" $2 $3; yy=$? ;; + 'aSImn') testoutput_var $1 "seaice_area_min" "SIce Area min" $2 $3; yy=$? ;; + 'aSImx') testoutput_var $1 "seaice_area_max" "SIce Area max" $2 $3; yy=$? ;; + 'aSIav') testoutput_var $1 "seaice_area_mean" "SIce Area mean" $2 $3; yy=$? ;; + 'aSIsd') testoutput_var $1 "seaice_area_sd" "SIce Area StDv" $2 $3; yy=$? ;; + 'hSImn') testoutput_var $1 "seaice_heff_min" "SIce Heff min" $2 $3; yy=$? ;; + 'hSImx') testoutput_var $1 "seaice_heff_max" "SIce Hell max" $2 $3; yy=$? ;; + 'hSIav') testoutput_var $1 "seaice_heff_mean" "SIce Hell mean" $2 $3; yy=$? ;; + 'hSIsd') testoutput_var $1 "seaice_heff_sd" "SIce Hell StDv" $2 $3; yy=$? ;; + 'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;; + 'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South" $2 $3; yy=$? ;; + 'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North" $2 $3; yy=$? ;; + 'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Global" $2 $3; yy=$? ;; + 'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South" $2 $3; yy=$? ;; + 'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North" $2 $3; yy=$? ;; *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;; esac if test $xx = $sVar @@ -304,17 +293,14 @@ done nbVar=`echo $listVar | awk '{print NF}'` - if [ $nbVar -lt $nbDef ] ; then + if [ $nbVar -lt $LEN_CHECK_LIST ] ; then #-- fill line (up to standard length) with dot: - adNul=`expr $nbDef - $nbVar | awk '{for(i=1;i<=$1;i++){print "."}}'` + adNul=`expr $LEN_CHECK_LIST - $nbVar | awk '{for(i=1;i<=$1;i++){print "."}}'` echo $allargs $adNul else echo $allargs fi - - else - testoutput_ad $1 $2 "precision_grdchk_result" - fi +# <-- same processing for adjoint & forward test } genmakemodel() @@ -342,6 +328,9 @@ if test "x$IEEE" != x ; then command="$command -ieee" fi + if test "x$GSL" = xt ; then + command="$command -gsl" + fi if test "x$MPI" = xt ; then command="$command -mpi" fi @@ -414,6 +403,7 @@ find . -type l -exec rm {} \; rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime rm -rf mnc_test_* + rm -f *_MIT_CE_000.opt0000 costfunction*0000 echo successful 1>&2 exit 0 ) @@ -484,7 +474,7 @@ CODE_DIR=$dir/$code_dir # These are files that should replace their counter-part when using -mpi - MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi")` + MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi" -print)` # Is this an MPI run? if test "x$MPI" = xt ; then @@ -542,8 +532,9 @@ if test -h eedata ; then rm -f eedata ; fi fi fi + prevDir='NONE' for ldir in $* ; do - if test -d "../"$ldir ; then + if test -d "../"$ldir -a $ldir != $prevDir ; then printf 'ldir='${ldir} 1>&2 files=`( cd "../"$ldir ; ls -1 | grep -v CVS )` for i in $files ; do @@ -559,6 +550,7 @@ fi printf ' ; ' 1>&2 fi + prevDir=$ldir done ) fi @@ -575,6 +567,10 @@ printf 'runmodel in %s ...' $1 1>&2 # make output.txt echo + if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then + diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1 + outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi + fi if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00 ln -sf "../"$builddir"/"$EXECUTABLE . @@ -586,7 +582,8 @@ RETVAL=8 ENDVAL=-1 else - if test $OUTPUTFILE -ot $EXECUTABLE ; then + if test ! -f $OUTPUTFILE -o $OUTPUTFILE -ot $EXECUTABLE ; then + # output do not exist or is older than executable: rm -f run.log ; touch run.log if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi ( eval $COMMAND ) >> run.log 2>&1 @@ -637,7 +634,7 @@ double a,b,abave,relerr; best = -22; lncnt = 0; - while( 1 & (lncnt+=1) < 999 ) { + while( 1 & ( (lncnt+=1) < 999 ) ) { scanf("%d", &linnum); if (linnum == -1) break; scanf("%lf", &a); scanf("%lf", &b); @@ -684,8 +681,9 @@ listPrt=$@ listRes=`echo $listPrt | sed 's/>//' | sed 's///' | sed 's/<.*//' | awk '{print $1}'` - printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/ > />/' | sed 's/ < / / /' | sed 's/ < / /' + printf '%3s' $listPrt +# line below does not work on hp-ux_ia64 : do those substitutions later on +# printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/ > />/' | sed 's/ < / $OUTPUTFILE" fi @@ -958,19 +957,22 @@ OUTPUTFILE="STDOUT.0000" fi -#echo "OK" echo "OK (COMMAND= $COMMAND )" # set the Default List of output variables to be checked: # (use default or load experiment-specific list from file "tr_checklist") # content : 1rst = main variable used to decide if it pass or FAIL # others = number of matching digits to be printed in summary.txt -if test "x$ADM" != xt ; then +if test "x$ADM" = x ; then DEF_CHECK_LIST='PS PS T+ S+ U+ V+ pt1+ pt2+ pt3+ pt4+ pt5+' EMPTY_RESULTS='.. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..' - nbDef=`echo $DEF_CHECK_LIST | awk '{print NF-1+3*gsub("+","E")}'` + LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'` ii=`echo $EMPTY_RESULTS | awk '{print NF}'` - EMPTY_RESULTS=$EMPTY_RESULTS`expr $nbDef - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf " ."}}'` + EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf " ."}}'` +else + DEF_CHECK_LIST='Grad Cost Grad' + EMPTY_RESULTS='.. ..' + LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'` fi # create the FORTRAN comparison code @@ -984,6 +986,8 @@ fi # Create a uniquely named directory to store results +CMDLINE=$0 +for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done MACH=`hostname` UNAMEA=`uname -a` DATE=`date +%Y%m%d` @@ -1004,9 +1008,10 @@ exit 1 fi SUMMARY="$DRESULTS/summary.txt" -printf "Start time: " >> $SUMMARY start_date=`date` echo $start_date > $SUMMARY +echo 'run:' $CMDLINE >> $SUMMARY +echo 'on :' $UNAMEA >> $SUMMARY of_path= if test "x$OPTFILE" != xNONE ; then @@ -1064,6 +1069,10 @@ else echo "ADJOINT=true" >> $SUMMARY echo >> $SUMMARY + if [ $MATCH_CRIT -lt 10 ] ; + then line_0="default "$MATCH_CRIT ; + else line_0="default "$MATCH_CRIT ; fi + echo "$line_0" | tee -a $SUMMARY cat << EOF | tee -a $SUMMARY G D M C G E p a R o r @@ -1076,15 +1085,25 @@ # ...and each test directory... for dir in $TESTDIRS ; do + # set builddir & rundir: + builddir="build" + if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi + rundir="run" + if test ! -d $dir/$rundir ; then + rundir=$builddir + fi + CODE_DIR=$dir/$code_dir + BUILD_DIR=$dir/$builddir + # Cleanup only! if test "x$CLEANUP" = xt ; then - if test -r $dir/build/Makefile ; then + if test -r $BUILD_DIR/Makefile ; then echo ' ------ clean dir:' $dir/build - ( cd $dir/build ; make CLEAN ) + ( cd $BUILD_DIR ; make CLEAN ) fi - if test -d $dir/run/CVS ; then - echo ' ------ clean dir:' $dir/run - run_clean $dir/run + if test -d $dir/$rundir/CVS ; then + echo ' ------ clean dir:' $dir/$rundir + run_clean $dir/$rundir fi ( cd $dir @@ -1095,12 +1114,7 @@ # Verify that the testdir exists and contains previous # results in the correct location--or skip this directory! - fout= - if test "x$ADM" = x ; then - fout=$dir"/results/output.txt" - else - fout=$dir"/results_ad/output_adm.txt" - fi + fout=$dir"/results/"$ref_outp if test ! -r $fout ; then echo "can't read \"$fout\" -- skipping $dir" continue @@ -1111,25 +1125,6 @@ # Check for additional types of monitor output - builddir="build" - if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi - rundir="run" - #rundir=$builddir - if test ! -d $dir/$rundir ; then - rundir=$builddir - fi - - if test "x$ADM" = x ; then - code_dir=code - CODE_DIR=$dir/code - input_dirs='input' - else - code_dir=code_ad - CODE_DIR=$dir/code_ad - input_dirs='input_ad input' - fi - BUILD_DIR=$dir/$builddir - if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir" continue @@ -1141,24 +1136,23 @@ # Check whether there are "extra runs" for this testdir extra_runs= - if test "x$ADM" = x ; then - ex_run_dirs=`( cd $dir ; echo input.* )` - #echo "ex_run_dirs='$ex_run_dirs'" - for exd in $ex_run_dirs ; do - name=`echo $exd | sed -e 's/input.//g'` - outf="$dir/results/output.$name.txt" - if test -f $outf -a -r $outf ; then - if test "x$MULTI_THREAD" = "xt" ; then - if test -r $dir"/"$exd"/eedata.mth" ; then - extra_runs="$extra_runs $name" - #else echo $dir"/"$exd"/eedata.mth: not found" - fi - else + ex_run_dirs=`( cd $dir ; echo $inputdir.* )` + #echo "ex_run_dirs='$ex_run_dirs'" + for exd in $ex_run_dirs ; do + name=`echo $exd | sed -e "s/$inputdir\.//"` + refExOut=`echo $ref_outp | sed "s/\./.${name}./"` + outf="$dir/results/$refExOut" + if test -f $outf -a -r $outf ; then + if test "x$MULTI_THREAD" = "xt" ; then + if test -r $dir"/"$exd"/eedata.mth" ; then extra_runs="$extra_runs $name" + #else echo $dir"/"$exd"/eedata.mth: not found" fi + else + extra_runs="$extra_runs $name" fi - done - fi + fi + done echo "-------------------------------------------------------------------------------" echo @@ -1187,64 +1181,60 @@ && symlink_mpifiles $dir $code_dir $builddir \ && makedependmodel $dir/$builddir && makedepend=Y \ && makemodel $dir/$builddir && make=Y \ - && linkdata $dir/$rundir $input_dirs \ + && linkdata $dir/$rundir $inputdir input \ && runmodel $dir/$rundir && run=Y \ - && results=`testoutput_run $dir $rundir "txt"` + && results=`testoutput_run $dir $rundir $ref_outp` fi echo - if test "x$ADM" = x ; then fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results` echo - echo "$fres" >> $SUMMARY - touch $CDIR"/summary.txt" - echo "fresults='$fres'" >> $CDIR"/summary.txt" + echo "$fres" | sed 's/ 99/ --/g' | sed 's/ > />/' | sed 's/ < /> $SUMMARY + touch $CDIR"/summary.txt" + echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt" echo "MACH='$MACH'" >> $CDIR"/summary.txt" echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt" echo "DATE='$DATE'" >> $CDIR"/summary.txt" echo "tdir='$dir'" >> $CDIR"/summary.txt" + if test "x$ADM" = xt ; then + head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt" + grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \ + >> $CDIR"/summary.txt" + fi for ex in $extra_runs ; do unset run results=$EMPTY_RESULTS + # reference output file + refExOut=`echo $ref_outp | sed "s/\./.${ex}./g"` # Create an output dir for each OPTFILE/tdir.ex combination rel_CDIR=$DRESULTS"/"$dir"."$ex mkdir $rel_CDIR CDIR=`pwd`"/$rel_CDIR" test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex" - run_clean $dir/tr_run.$ex - linkdata $dir/tr_run.$ex input.$ex input + run_clean $dir/tr_run.$ex + linkdata $dir/tr_run.$ex $inputdir.$ex $inputdir input runmodel $dir/tr_run.$ex && run=Y \ - && results=`testoutput_run $dir tr_run.$ex ${ex}".txt"` - fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}` + && results=`testoutput_run $dir tr_run.$ex $refExOut` fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results` fres="$fres.$ex" echo - echo "$fres" >> $SUMMARY - touch $CDIR"/summary.txt" - echo "fresults='$fres'" >> $CDIR"/summary.txt" + echo "$fres" | sed 's/ 99/ --/g' | sed 's/ > />/' | sed 's/ < /> $SUMMARY + touch $CDIR"/summary.txt" + echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt" echo "MACH='$MACH'" >> $CDIR"/summary.txt" echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt" echo "DATE='$DATE'" >> $CDIR"/summary.txt" echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt" + if test "x$ADM" = xt ; then + head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt" + grep -A3 'Seconds in section "ALL' $dir/tr_run.$ex/$OUTPUTFILE \ + >> $CDIR"/summary.txt" + fi if test "x$POSTCLEAN" = xt ; then - run_clean $dir/tr_run.$ex + run_clean $dir/tr_run.$ex fi done - else - fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}` - fres=$fres"$results $dir" - echo - echo "$fres" >> $SUMMARY - touch $CDIR"/summary.txt" - echo "fresults='$fres'" >> $CDIR"/summary.txt" - echo "MACH='$MACH'" >> $CDIR"/summary.txt" - echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt" - echo "DATE='$DATE'" >> $CDIR"/summary.txt" - echo "tdir='$dir'" >> $CDIR"/summary.txt" - grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \ - >> $CDIR"/summary.txt" - fi #postclean $dir/$builddir if test "x$POSTCLEAN" = xt ; then @@ -1291,12 +1281,11 @@ rm -f tr_cmpnum.c tr_cmpnum if test "x$CLEANUP" != xt ; then - cat $SUMMARY | sed 's/ \. \. \. \. \. \. \. \. \. \. \. \.//' -# cat $SUMMARY | sed 's/ \.//g' + cat $SUMMARY | sed 's/ \. \. \. \. \. \. \. \. \. \. \. \. //' if test -e tr_out.txt ; then mv tr_out.txt tr_out.txt.old fi - cat $SUMMARY | sed 's/ \.//g' > tr_out.txt + cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/ \. //g' > tr_out.txt fi if test "x$DELDIR" = xt ; then