/[MITgcm]/MITgcm/verification/testreport

Diff of /MITgcm/verification/testreport

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.90 by ce107,
Wed Jan 31 21:28:34 2007 UTC
+revision 1.99 by jmc,
Sat Sep 15 20:30:05 2007 UTC
 Line 35 
 usage()
      echo "                             (DEF=\"hostname\")"
      echo "  (-ptr|-ptracers) STRING  specify which ptracers to test"
      echo "                             (DEF=\"1 2 3 4 5\")"
+     echo "  (-match) NUMBER          Matching Criteria (number of digits)"
+     echo "                             (DEF=\"12\")"
      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
      echo "  (-clean)                 *ONLY* run \"make CLEAN\""
      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
-Line 92 
 build_mpack()
+Line 94 
 build_mpack()
      echo "OK"
  }
- testoutput_for_prop()
+ testoutput_var()
  {
-     # testoutput_for_prop dir s1 label subdir extension
+     # testoutput_var dir s1 label subdir reference_output
      #
-     #  compares files $dir/$subdir/$OUTPUTFILE and $dir/results/output.txt
+     #  compares 1 variable output selected from file $dir/$subdir/$OUTPUTFILE
-     #  using search strings s1 and text label
+     #     with same output from reference file $dir/results/$reference_output
+     #  using search strings s1 and text label
      if [ $debug -gt 0 ]; then
-         echo testoutput_for_prop: grep "$2" $1/$4/$OUTPUTFILE 1>&2
+         echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2
      fi
      if [ -r $1/$4/$OUTPUTFILE ]; then
          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt
-Line 112 
 testoutput_for_prop()
+Line 115 
 testoutput_for_prop()
              return 99
          fi
      else
-         echo testoutput_for_prop: $OUTPUTFILE from model run was not readable 1>&2
+         echo testoutput_var: $OUTPUTFILE from model run was not readable 1>&2
          return 99
      fi
      if [ $debug -gt 0 ]; then
-         echo testoutput_for_prop: 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 [ $verbose -gt 0 ]; then
-Line 134 
 testoutput_for_prop()
+Line 137 
 testoutput_for_prop()
      fi
      has_nan=`cat tmp1.txt | grep -i nan | wc -l`
      if [ $has_nan -gt 0  ] ; then
-         echo testoutput_for_prop: $OUTPUTFILE contains $has_nan NaN values  1>&2
+         echo testoutput_var: $OUTPUTFILE contains $has_nan NaN values  1>&2
          return 99
      fi
      has_inf=`cat tmp1.txt | grep -i inf | wc -l`
      if [ $has_inf -gt 0  ] ; then
-         echo testoutput_for_prop: $OUTPUTFILE contains $has_inf Inf values  1>&2
+         echo testoutput_var: $OUTPUTFILE contains $has_inf Inf values  1>&2
          return 99
      fi
      if [ $debug -gt 0 ]; then
-         echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2
+         echo testoutput_var: join tmp1.txt tmp2.txt 1>&2
      fi
      join tmp1.txt tmp2.txt | awk '{print $1 " " $2 " " $3}' > tmp3.txt
      if [ $debug -gt 0 ]; then
-         echo testoutput_for_prop: compare_lines 1>&2
+         echo testoutput_var: compare_lines 1>&2
      fi
      if [ $verbose -gt 1 ]; then
          cat tmp3.txt 1>&2
-Line 155 
 testoutput_for_prop()
+Line 158 
 testoutput_for_prop()
      echo "-1" >> tmp3.txt
      # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number
      cat tmp3.txt | sed -e 's|:||g' > tmp4.txt
-     digits_of_similarity=`./tmp_cmpnum < tmp4.txt`
+     digits_of_similarity=`./tr_cmpnum < tmp4.txt`
      if [ $digits_of_similarity -eq 99 ]; then
          if [ $verbose -gt 0 ]; then
-             echo testoutput_for_prop: 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
-Line 196 
 testoutput_ad()
+Line 199 
 testoutput_ad()
      join t06.txt t16.txt > t6.txt
      echo "-1" >> t5.txt
      echo "-1" >> t6.txt
-     digits_5=`./tmp_cmpnum < t5.txt`
+     digits_5=`./tr_cmpnum < t5.txt`
-     digits_6=`./tmp_cmpnum < t6.txt`
+     digits_6=`./tr_cmpnum < t6.txt`
      dashnum $digits_5 $digits_6
      rm -f t[01][56].txt t[56].txt
  }
-Line 227 
 check_for_add_mon_output()
+Line 230 
 check_for_add_mon_output()
      done
  }
- testoutput()
+ testoutput_run()
  {
-     # testoutput directory subdir extension
+     # testoutput_run directory subdir reference_output
      #
-     #  test output in "directory"
+     #  test output from 1 run in "directory"
      if test "x$ADM" = x ; then
-         if [ $debug -gt 0 ]; then
+         # default list of output variables to be checked:
-             echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2
+         #  1rst : main variable used to decide if it pass or FAIL
-         fi
+         #  others : number of matching digits to be printed in summary.txt
-         testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2 $3; cg2dres=$?
+         listChk=$DEF_CHECK_LIST
-         if [ $debug -gt 0 ]; then
+         #  load experiment-specific list from file "tr_checklist" (if it exist)
-             echo testoutput: cg2dres=$cg2dres 1>&2
+         if test -r $1/$2/tr_checklist ; then listChk=`cat $1/$2/tr_checklist` ; fi
-         fi
+         sVar=`echo $listChk | awk '{print $1}'`
-         testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2 $3; tmin=$?
+         # remove 1rst var and expand the list: + => min max mean s.d
-         testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2 $3; tmax=$?
+         listVar=`echo $listChk | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' \
-         testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2 $3; tmean=$?
+                                | sed 's/+//g' | sed "s/^$sVar//"`
-         testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2 $3; tsd=$?
+         if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(I)='$listVar'" 1>&2 ; fi
-         testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2 $3; smin=$?
+         for ii in 1 2 3 4 5 6 7 8 9 ; do
-         testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2 $3; smax=$?
+           tst=`eval 'echo "$HAVE_PTR0'$ii'"'`
-         testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2 $3; smean=$?
+          #echo "-- ptr test=" $tst "number of var=" `echo $listVar | awk '{print NF}'` 1>&2
-         testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2 $3; ssd=$?
+           if test "x$tst" != xt ; then listVar=`echo "$listVar" | sed "s/ pt$ii..//g"` ; fi
-         testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2 $3; umin=$?
+         done
-         testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2 $3; umax=$?
+         tst=`echo $sVar $listVar | awk '{ for(i=2;i<=NF;i++){t+=($i==$1)}; print t }'`
-         testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2 $3; umean=$?
+         if test $tst != 1 ; then
-         testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2 $3; usd=$?
+           if test $tst = 0 ; then echo "==> WARNING: selected var >$sVar< not found" 1>&2
-         testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2 $3; vmin=$?
+                  else echo "==> WARNING: found selected var >$sVar< $tst times" 1>&2 ; fi
-         testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2 $3; vmax=$?
+           echo "==> WARNING: in checked list:" $listVar 1>&2
-         testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2 $3; vmean=$?
+         #- put it back once:
-         testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2 $3; vsd=$?
+           listVar=" $sVar "`echo "$listVar " | sed "s/ $sVar / /g"`
+         fi
-         #  This is for PTRACERS
+         if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(M)='$listVar'" 1>&2 ; fi
-         for ii in $PTRACERS_NUM ; do
+         echo "listVar='$listVar'" > $CDIR"/summary.txt"
-             eval `echo "p0"$ii"_min=99"`
+         allargs=""
-             eval `echo "p0"$ii"_max=99"`
+         for xx in $listVar
-             eval `echo "p0"$ii"_mean=99"`
+         do
-             eval `echo "p0"$ii"_sd=99"`
+           case $xx in
-             tst=`eval 'echo "$HAVE_PTR0'$ii'"'`
+            'PS')  if [ $debug -gt 0 ]
-             #echo 'tst = '$tst
+                   then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi
-             if test "x$tst" = xt ; then
+                   testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $3; yy=$?
-                 a="trcstat_ptracer0"
+                   if [ $debug -gt 0 ] ; then echo testoutput_run: cg2dres=$yy 1>&2 ; fi ;;
-                 testoutput_for_prop $1 "$a"$ii"_min"  "p0"$ii"_min"  $2 $3
+            'Cost') testoutput_var $1 "ADM  precision_derivative_cost" "ADM Cost" $2 $3; yy=$? ;;
-                 RETVAL=$? ; eval `echo "p0"$ii"_min="$RETVAL`
+            'Grad') testoutput_var $1 "ADM  precision_derivative_grad" "ADM Grad" $2 $3; yy=$? ;;
-                 testoutput_for_prop $1 "$a"$ii"_max"  "p0"$ii"_max"  $2 $3
+            'Tmn') testoutput_var $1 "dynstat_theta_min"  "Theta minimum"  $2 $3; yy=$? ;;
-                 RETVAL=$? ; eval `echo "p0"$ii"_max="$RETVAL`
+            'Tmx') testoutput_var $1 "dynstat_theta_max"  "Theta maximum"  $2 $3; yy=$? ;;
-                 testoutput_for_prop $1 "$a"$ii"_mean" "p0"$ii"_mean" $2 $3
+            'Tav') testoutput_var $1 "dynstat_theta_mean" "Theta mean"     $2 $3; yy=$? ;;
-                 RETVAL=$? ; eval `echo "p0"$ii"_mean="$RETVAL`
+            'Tsd') testoutput_var $1 "dynstat_theta_sd"   "Theta Std.Dev"  $2 $3; yy=$? ;;
-                 testoutput_for_prop $1 "$a"$ii"_sd"   "p0"$ii"_sd"   $2 $3
+            'Smn') testoutput_var $1 "dynstat_salt_min"  "Salt minimum"    $2 $3; yy=$? ;;
-                 RETVAL=$? ; eval `echo "p0"$ii"_sd="$RETVAL`
+            'Smx') testoutput_var $1 "dynstat_salt_max"  "Salt maximum"    $2 $3; yy=$? ;;
-             fi
+            'Sav') testoutput_var $1 "dynstat_salt_mean" "Salt mean"       $2 $3; yy=$? ;;
-         done
+            '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=$? ;;
-         allargs="$cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd"
+            'Umx') testoutput_var $1 "dynstat_uvel_max"  "U maximum"       $2 $3; yy=$? ;;
-         allargs="$allargs $umin $umax $umean $usd $vmin $vmax $vmean $vsd"
+            'Uav') testoutput_var $1 "dynstat_uvel_mean" "U mean"          $2 $3; yy=$? ;;
-         allargs="$allargs $p01_min $p01_max $p01_mean $p01_sd"
+            'Usd') testoutput_var $1 "dynstat_uvel_sd"   "U Std.Dev"       $2 $3; yy=$? ;;
-         allargs="$allargs $p02_min $p02_max $p02_mean $p02_sd"
+            'Vmn') testoutput_var $1 "dynstat_vvel_min"  "V minimum"       $2 $3; yy=$? ;;
-         allargs="$allargs $p03_min $p03_max $p03_mean $p03_sd"
+            'Vmx') testoutput_var $1 "dynstat_vvel_max"  "V maximum"       $2 $3; yy=$? ;;
-         allargs="$allargs $p04_min $p04_max $p04_mean $p04_sd"
+            'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean"          $2 $3; yy=$? ;;
-         allargs="$allargs $p05_min $p05_max $p05_mean $p05_sd"
+            '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/..$//'`
-         eval "dashnum $allargs"
+            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/..$//'`
+            testoutput_var $1 "trcstat_ptracer0"$ii"_max"  "p0"$ii"_max"   $2 $3; yy=$? ;;
+         '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"_StDv"  $2 $3; yy=$? ;;
+               *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
+           esac
+           if test $xx = $sVar
+           then allargs="$allargs > $yy <"
+           else allargs="$allargs $yy"
+           fi
+         done
+         nbVar=`echo $listVar | awk '{print NF}'`
+         if [ $nbVar -lt $LEN_CHECK_LIST ] ; then
+         #-- fill line (up to standard length) with dot:
+           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"
-Line 562 
 runmodel()
+Line 587 
 runmodel()
                  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
-Line 605 
 createcodelet()
+Line 631 
 createcodelet()
      # create codelet for comparing model output
      printf "creating the comparison code...  "
-     cat > tmp_cmpnum.c <<EOF
+     cat > tr_cmpnum.c <<EOF
  #include <stdio.h>
  #include <math.h>
  int main( int argc, char** argv )  {
-   int linnum,best,lncnt;
+   int linnum,cmplin,best,lncnt;
    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);
      abave = 0.5*(fabs(a)+fabs(b));
-     if (abave > 0.0) {
+     if ( abave == abave ) {
-       relerr=fabs(a-b)/abave;
+       if (abave > 0.0) {
-       if (relerr > 0.0) { linnum = (int)rint(log10(relerr)); }
+         relerr=fabs(a-b)/abave;
-       else { linnum = -16 ; }
+         if (relerr > 0.0) { cmplin = (int)rint(log10(relerr)); }
-       best = (best > linnum) ? best : linnum;
+         else { cmplin = -16 ; }
-     }
+         best = (best > cmplin) ? best : cmplin; }
+       else { cmplin = -22 ; }
+    /* printf("%d ; %lf ; %lf\n",cmplin,a,b); */
+       }
+    else {
+    /* printf("%lf ; %lf ; %lf\n",abave,a,b); */
+       break; }
    }
    if (lncnt == 999) best=-29;
+   if (linnum != -1) best=-99;
    printf("%d\n", -best);
    return 0;
  }
  EOF
-     $CC -o tmp_cmpnum tmp_cmpnum.c -lm
+     $CC -o tr_cmpnum tr_cmpnum.c -lm
-     if [ -x ./tmp_cmpnum ]; then
+     if [ -x ./tr_cmpnum ]; then
          echo "OK"
          return 0
      else
-Line 650 
 formatresults()
+Line 683 
 formatresults()
      nm=$1
      printf '%s %s %s %s' $2 $3 $4 $5
      shift; shift; shift; shift; shift;
-     printf '%3s' $@
+     listPrt=$@
+     listRes=`echo $listPrt | sed 's/>//' | sed 's/<//'`
+     xx=`echo $listPrt | sed 's/.*>//' | sed 's/<.*//' | awk '{print $1}'`
+     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/  < /</'
-     if [ $1 = '--' ]; then
+     if [ $xx = '..' ]; then
+         printf ' N/O '
+     elif [ $xx = '--' ]; then
+         printf ' N/O '
+     elif [ $xx = 99 ]; then
          printf ' N/O '
      else
-         if [ $1 -gt 12 ]; then
+         if [ $xx -ge $MATCH_CRIT ]; then
              printf ' pass'
          else
              printf ' FAIL'
-Line 670 
 scandirs()
+Line 712 
 scandirs()
  {
      if [ $# -eq 1 ]; then
          for arg in * ; do
-             test -d $arg/$1 && echo $arg
+             test -f $arg/$1 && echo $arg
          done
      else
          echo $*
-Line 727 
 ADM=
+Line 769 
 ADM=
  # Additional monitor types
  PTRACERS_NUM="1 2 3 4 5"
+ MATCH_CRIT=13
  printf "parsing options...  "
  ac_prev=
-Line 791 
 for ac_option ; do
+Line 835 
 for ac_option ; do
          -ptracers=* | --ptracers=* | -ptr=* | --ptr=*)
              PTRACERS_NUM=$ac_optarg ;;
+         -match | --match ) ac_prev=MATCH_CRIT ;;
+         -match=* | --match=* ) MATCH_CRIT=$ac_optarg ;;
          -j) ac_prev=JOBS ;;
          -j=*) JOBS=$ac_optarg ;;
-Line 850 
 if test "x$QUICK" = xt ; then
+Line 897 
 if test "x$QUICK" = xt ; then
      NODEPEND=t
  fi
+ #- setting for forward or ADM testing
+ if test "x$ADM" = xt ; then
+     code_dir=code_ad
+     input_dirs='input_ad input'
+     ref_outp="output_adm.txt"
+     EXECUTABLE="mitgcmuv_ad"
+ else
+     code_dir=code
+     input_dirs='input'
+     ref_outp="output.txt"
+     EXECUTABLE="mitgcmuv"
+ fi
  if test "x$TESTDIRS" = x ; then
      if test "x$ADM" = xt ; then
-         LIST=`scandirs results_ad`
+         LIST=`scandirs results_ad/$ref_outp`
      else
-         LIST=`scandirs results`
+         LIST=`scandirs results/$ref_outp`
      fi
  else
      #- expand group of experiments:
-Line 899 
 if test "x$OPTFILE" = xNONE -a "x$MITGCM
+Line 959 
 if test "x$OPTFILE" = xNONE -a "x$MITGCM
      OPTFILE=$MITGCM_OF
  fi
- if test "x$ADM" = xt ; then
+ OUTPUTFILE=$ref_outp
-     EXECUTABLE="mitgcmuv_ad"
-     OUTPUTFILE="output_adm.txt"
- else
-     EXECUTABLE="mitgcmuv"
-     OUTPUTFILE="output.txt"
- fi
  if test "x$COMMAND" = x ; then
      COMMAND="./$EXECUTABLE > $OUTPUTFILE"
  fi
-Line 917 
 fi
+Line 970 
 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" = x ; then
+     DEF_CHECK_LIST='PS PS T+ S+ U+ V+ pt1+ pt2+ pt3+ pt4+ pt5+'
+     EMPTY_RESULTS='.. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..'
+     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 $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`
+ else
+     DEF_CHECK_LIST='Cost 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
  createcodelet
-Line 980 
 fi
+Line 1049 
 fi
  echo
  echo >> $SUMMARY
  if test "x$ADM" = x ; then
-     line_0="            ----T-----  ----S-----  ----U-----  ----V-----"
+     if [ $MATCH_CRIT -lt 10 ] ;
+     then line_0="default  "$MATCH_CRIT ;
+     else line_0="default "$MATCH_CRIT ; fi
+        line_0="$line_0  ----T-----  ----S-----  ----U-----  ----V-----"
+ #   line_0="            ----T-----  ----S-----  ----U-----  ----V-----"
      line_1="G D M    c        m  s        m  s        m  s        m  s"
      line_2="E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  ."
      line_3="N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d"
-Line 1037 
 for dir in $TESTDIRS ; do
+Line 1110 
 for dir in $TESTDIRS ; do
      #  results in the correct location--or skip this directory!
      fout=
      if test "x$ADM" = x ; then
-         fout=$dir"/results/output.txt"
+         fout=$dir"/results/"$ref_outp
      else
-         fout=$dir"/results_ad/output_adm.txt"
+         fout=$dir"/results_ad/"$ref_outp
      fi
      if test ! -r $fout ; then
          echo "can't read \"$fout\" -- skipping $dir"
-Line 1054 
 for dir in $TESTDIRS ; do
+Line 1127 
 for dir in $TESTDIRS ; do
      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
+     CODE_DIR=$dir/$code_dir
-     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
-Line 1109 
 for dir in $TESTDIRS ; do
+Line 1172 
 for dir in $TESTDIRS ; do
      fi
      echo
      unset genmake makedepend make run
-     results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
+     results=$EMPTY_RESULTS
      #  Create an output dir for each OPTFILE/tdir combination
      rel_CDIR=$DRESULTS"/"$dir
-Line 1129 
 for dir in $TESTDIRS ; do
+Line 1192 
 for dir in $TESTDIRS ; do
              && makemodel $dir/$builddir && make=Y \
              && linkdata $dir/$rundir $input_dirs \
              && runmodel $dir/$rundir && run=Y \
-             && results=`testoutput $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
+         echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
-         echo "fresults='$fres'" > $CDIR"/summary.txt"
+         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"
-Line 1145 
 for dir in $TESTDIRS ; do
+Line 1209 
 for dir in $TESTDIRS ; do
          for ex in $extra_runs ; do
              unset run
-             results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
+             results=$EMPTY_RESULTS
              #  Create an output dir for each OPTFILE/tdir.ex combination
              rel_CDIR=$DRESULTS"/"$dir"."$ex
              mkdir $rel_CDIR
-Line 1154 
 for dir in $TESTDIRS ; do
+Line 1218 
 for dir in $TESTDIRS ; do
              run_clean $dir/tr_run.$ex
              linkdata $dir/tr_run.$ex input.$ex input
              runmodel $dir/tr_run.$ex && run=Y \
-                 && results=`testoutput $dir tr_run.$ex ${ex}".txt"`
+                 && results=`testoutput_run $dir tr_run.$ex "output.${ex}.txt"`
-             fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
              fres="$fres.$ex"
              echo
-             echo "$fres" >> $SUMMARY
+             echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
-             echo "fresults='$fres'" > $CDIR"/summary.txt"
+             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"
-Line 1174 
 for dir in $TESTDIRS ; do
+Line 1238 
 for dir in $TESTDIRS ; do
          fres=$fres"$results   $dir"
          echo
          echo "$fres" >> $SUMMARY
-         echo "fresults='$fres'" > $CDIR"/summary.txt"
+         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"
+     fi
+     if test "x$ADM" = xt ; then
          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
                             >> $CDIR"/summary.txt"
      fi
-Line 1225 
 else
+Line 1292 
 else
      fi
  fi
- # rm -f tmp_cmpnum.f a.out
+ rm -f tr_cmpnum.c tr_cmpnum
- rm -f tmp_cmpnum.c tmp_cmpnum
  if test "x$CLEANUP" != xt ; then
-     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

 Legend:



Removed from v.1.90
 


changed lines


 
Added in v.1.99
 Legend:



Removed from v.1.90
 


changed lines


 
Added in v.1.99
-Removed from v.1.90
+Added in v.1.99

	ViewVC Help
Powered by ViewVC 1.1.22