/[MITgcm]/MITgcm/verification/testreport

Diff of /MITgcm/verification/testreport

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

-revision 1.30 by edhill,
Fri Dec  5 17:46:32 2003 UTC
+revision 1.69 by jmc,
Thu Jul 28 16:32:34 2005 UTC
 Line 13 
 usage()
      echo "  (-help|-h)               print usage"
      echo "  (-mpi)                   use MPI input files"
      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
-     echo "                             (DEF=\"noieee\")"
+     echo "                             (DEF=\"-ieee\")"
      echo "  (-optfile=|-of=)STRING   list of optfiles to use"
      echo "  (-a|-addr) STRING        list of email recipients"
      echo "                             (DEF=\"edhill@mitgcm.org\")"
 Line 27 
 usage()
      echo "                             (DEF=\"make output.txt\")"
      echo "  (-m|-make) STRING        command to use for \"make\""
      echo "                             (DEF=\"make\")"
+     echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"
+     echo "                             (DEF=\"1 2 3 4 5\")"
+     echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
      echo "  (-clean)                 *ONLY* run \"make CLEAN\""
      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
-     echo "and where STRING follows a whitespace-delimited format"
+     echo "and where STRING can be a whitespace-delimited list"
      echo "such as:"
+     echo
      echo "  -t 'exp0 exp2 exp3' "
      echo "  -addr='abc@123.com testing@home.org'"
      echo
+     echo "provided that the expression is properly quoted within the current"
+     echo "shell (note the use of single quotes to protect white space)."
+     echo
      exit 1
  }
  #  build the mpack utility
  build_mpack()
  {
-     echo -n "building the mpack utility...  "
+     printf "building the mpack utility...  "
      if test ! -x "$MPACKDIR/mpack" ; then
          if test ! -d $MPACKDIR ; then
              echo
-Line 54 
 build_mpack()
+Line 62 
 build_mpack()
              echo
              HAVE_MPACK=f
          fi
-         echo -n "building mpack...  "
+         printf "building mpack...  "
          if test "x$CC" = x ; then
              export CC=cc
          fi
-Line 77 
 build_mpack()
+Line 85 
 build_mpack()
  testoutput_for_prop()
  {
-     # testoutput_for_prop dir s1 label subdir
+     # testoutput_for_prop dir s1 label subdir extension
      #
      #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt
      #  using search strings s1 and text label
-Line 87 
 testoutput_for_prop()
+Line 95 
 testoutput_for_prop()
      fi
      if [ -r $1/$4/output.txt ]; then
          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
-         lncnt=`wc -l tmp1.txt | awk '{print $1}' `
+         lncntA=`wc -l tmp1.txt | awk '{print $1}' `
-         if [ $lncnt -lt 3 ]; then
+         if [ $lncntA -lt 3 ]; then
              if [ $verbose -gt 0 ]; then
                  echo Not enough lines of output when searching for "$2" 1>&2
              fi
-Line 99 
 testoutput_for_prop()
+Line 107 
 testoutput_for_prop()
          return 99
      fi
      if [ $debug -gt 0 ]; then
-         echo testoutput_for_prop: grep "$2" $1/results/output.txt 1>&2
+         echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2
      fi
-     grep "$2" $1/results/output.txt | sed 's/.*=//' | cat -n > tmp2.txt
+     grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt
-     lncnt=`wc -l tmp2.txt | awk '{print $1}' `
+     lncntB=`wc -l tmp2.txt | awk '{print $1}' `
-     if [ $lncnt -lt 3 ]; then
+     if [ $lncntB -lt 3 ]; then
          if [ $verbose -gt 0 ]; then
              echo Not enough lines of output when searching for "$2" 1>&2
          fi
          return 99
      fi
+     if [ $lncntA -ne $lncntB ]; then
+         if [ $verbose -gt 0 ]; then
+             echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2
+         fi
+         return 99
+     fi
      if [ $debug -gt 0 ]; then
          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2
      fi
-Line 169 
 testoutput_ad()
+Line 183 
 testoutput_ad()
      rm -f t[01][56].txt t[56].txt
  }
+ check_for_add_mon_output()
+ {
+     # Check for additional types of monitor output
+     if test "x$1" = x ; then
+         return
+     fi
+     for ii in $PTRACERS_NUM ; do
+         eval "HAVE_PTR0"$ii"=f"
+     done
+     ptr_add="trcstat_ptracerXX_min trcstat_ptracerXX_max"
+     ptr_add="$ptr_add trcstat_ptracerXX_mean trcstat_ptracerXX_sd"
+     for ii in $PTRACERS_NUM ; do
+         for jj in $ptr_add ; do
+             name=`eval "echo $jj | sed -e 's|XX|0"$ii"|g'"`
+             tst=`grep $name $1 | wc -l | awk '{print $1}'`
+             if test ! "x$tst" = x0 ; then
+                 eval "HAVE_PTR0"$ii"=t"
+             fi
+         done
+         #  eval 'echo "HAVE_PTR0'$ii' = $HAVE_PTR0'$ii'"'
+     done
+ }
  testoutput()
  {
-     # testoutput directory subdir
+     # testoutput directory subdir extension
      #
      #  test output in "directory"
      if test "x$ADM" = x ; then
          if [ $debug -gt 0 ]; then
              echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2
          fi
-         testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2; cg2dres=$?
+         testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2 $3; cg2dres=$?
          if [ $debug -gt 0 ]; then
              echo testoutput: cg2dres=$cg2dres 1>&2
          fi
-         testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?
+         testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2 $3; tmin=$?
-         testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?
+         testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2 $3; tmax=$?
-         testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?
+         testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2 $3; tmean=$?
-         testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2; tsd=$?
+         testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2 $3; tsd=$?
-         testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$?
+         testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2 $3; smin=$?
-         testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$?
+         testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2 $3; smax=$?
-         testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$?
+         testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2 $3; smean=$?
-         testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2; ssd=$?
+         testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2 $3; ssd=$?
-         testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$?
+         testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2 $3; umin=$?
-         testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$?
+         testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2 $3; umax=$?
-         testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$?
+         testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2 $3; umean=$?
-         testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2; usd=$?
+         testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2 $3; usd=$?
-         testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$?
+         testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2 $3; vmin=$?
-         testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$?
+         testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2 $3; vmax=$?
-         testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$?
+         testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2 $3; vmean=$?
-         testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2; vsd=$?
+         testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2 $3; vsd=$?
-         dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \
-             $umin $umax $umean $usd $vmin $vmax $vmean $vsd
+         #  This is for PTRACERS
+         for ii in $PTRACERS_NUM ; do
+             eval `echo "p0"$ii"_min=99"`
+             eval `echo "p0"$ii"_max=99"`
+             eval `echo "p0"$ii"_mean=99"`
+             eval `echo "p0"$ii"_sd=99"`
+             tst=`eval 'echo "$HAVE_PTR0'$ii'"'`
+             #echo 'tst = '$tst
+             if test "x$tst" = xt ; then
+                 a="trcstat_ptracer0"
+                 testoutput_for_prop $1 "$a"$ii"_min"  "p0"$ii"_min"  $2 $3
+                 RETVAL=$? ; eval `echo "p0"$ii"_min="$RETVAL`
+                 testoutput_for_prop $1 "$a"$ii"_max"  "p0"$ii"_max"  $2 $3
+                 RETVAL=$? ; eval `echo "p0"$ii"_max="$RETVAL`
+                 testoutput_for_prop $1 "$a"$ii"_mean" "p0"$ii"_mean" $2 $3
+                 RETVAL=$? ; eval `echo "p0"$ii"_mean="$RETVAL`
+                 testoutput_for_prop $1 "$a"$ii"_sd"   "p0"$ii"_sd"   $2 $3
+                 RETVAL=$? ; eval `echo "p0"$ii"_sd="$RETVAL`
+             fi
+         done
+         allargs="$cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd"
+         allargs="$allargs $umin $umax $umean $usd $vmin $vmax $vmean $vsd"
+         allargs="$allargs $p01_min $p01_max $p01_mean $p01_sd"
+         allargs="$allargs $p02_min $p02_max $p02_mean $p02_sd"
+         allargs="$allargs $p03_min $p03_max $p03_mean $p03_sd"
+         allargs="$allargs $p04_min $p04_max $p04_mean $p04_sd"
+         allargs="$allargs $p05_min $p05_max $p05_mean $p05_sd"
+         eval "dashnum $allargs"
      else
          testoutput_ad $1 $2 "precision_grdchk_result"
      fi
-Line 211 
 genmakemodel()
+Line 280 
 genmakemodel()
      if test "x$NOGENMAKE" = xt ; then
          echo "genmake skipped!"
      else
-         GENMAKE2="$BASH ../../../tools/genmake2"
+         if test "x$BASH" = x ; then
+             GENMAKE2="../../../tools/genmake2"
+         else
+             GENMAKE2="$BASH ../../../tools/genmake2 -bash $BASH"
+         fi
          (
              cd $1;
              command="$GENMAKE2  -ds -m $MAKE"
-Line 227 
 genmakemodel()
+Line 300 
 genmakemodel()
              if test "x$IEEE" != x ; then
                  command="$command -ieee"
              fi
+             if test "x$MPI" = xt ; then
+                 command="$command -mpi"
+             fi
              printf 'genmake ... ' 1>&2
              $command > make.log 2>&1
              RETVAL=$?
-             cp Makefile $CDIR
+             #  Reduce the size of the testing emails!
+             head -100 Makefile > $CDIR/Makefile_head
              if test "x$RETVAL" != x0 ; then
                  tail make.log
                  echo "genmakemodel: genmake failed" 1>&2
-Line 271 
 makeclean()
+Line 348 
 makeclean()
      fi
  }
+ postclean()
+ {
+     # postclean directory
+     if test "x$POSTCLEAN" = xt ; then
+         (
+             cd $1;
+             if test -r Makefile ; then
+                 $MAKE CLEAN >> /dev/null 2>&1
+             fi
+             exit 0
+         )
+     fi
+ }
  makedependmodel()
  {
      # makedependmodel directory
-Line 302 
 makemodel()
+Line 393 
 makemodel()
          if test -r Makefile ; then
              printf 'make ... ' 1>&2
              if test "x$ADM" = x ; then
-                 $MAKE >> make.log 2>&1
+                 if test "x$JOBS" = x ; then
+                     $MAKE >> make.log 2>&1
+                 else
+                     $MAKE -j $JOBS >> make.log 2>&1
+                 fi
              else
                  $MAKE adall >> make.log 2>&1
              fi
-Line 329 
 symlink_mpifiles()
+Line 424 
 symlink_mpifiles()
      code_dir=$2
      BUILD_DIR=$dir/$3
      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")`
-Line 344 
 symlink_mpifiles()
+Line 439 
 symlink_mpifiles()
              RETVAL=$?
              if test "x$RETVAL" != x0 ; then
                  if ! test -f $BUILD_DIR/$i ; then
-                 #echo Linking $name to $i
+                     #echo Linking $name to $i
                      (cd $BUILD_DIR; ln -sf ../$code_dir/$i $name)
                  fi
              fi
          done
      else
-     # NO: We undo any _mpi symbolically linked files
+         # NO: We undo any _mpi symbolically linked files
          for ii in $MPI_FILES ; do
              i=`echo $ii | sed 's:^\./::'`
              name=`echo $i | sed 's:_mpi::' `
              if test -L $BUILD_DIR/$name ; then
-                 linktarg=`(cd $BUILD_DIR; readlink $name)`
+                 cmp $BUILD_DIR/$name "../$code_dir/$name"_mpi > /dev/null 2>&1
-                 if test $linktarg = "../$code_dir/$name"_mpi ; then
+                 RETVAL=$?
-                 #echo Un-linking $name from $linktarg
+                 if test "x$RETVAL" = x0 ; then
+                     #echo Un-linking $name from $linktarg
                      rm -f $BUILD_DIR/$name
                  fi
              fi
-Line 377 
 linkdata()
+Line 473 
 linkdata()
              if test "x$ADM" = x ; then
                  files=`( cd ../input ; ls -1 | grep -v CVS )`
                  for i in $files ; do
-                     if test ! -d "../input/"$i ; then
+                     if test ! -d "../input/"$i -a ! -f $i ; then
                          ln -sf "../input/"$i $i
                      fi
                  done
-Line 409 
 runmodel()
+Line 505 
 runmodel()
          cd $1
          printf 'runmodel ... ' 1>&2
          # make output.txt
-         $COMMAND >> run.log 2>&1
+         echo
+         rm -f run.log
+         # echo "COMMAND='$COMMAND'"
+         # echo "pwd='"`pwd`"'"
+         ( eval $COMMAND ) > run.log 2>&1
          RETVAL=$?
          if test "x$RETVAL" = x0 ; then
+             tail run.log
              echo successful 1>&2
-             if test "x$ADM" = x ; then
+             # === Reduce the size of the testing emails!
-                 cp output.txt $CDIR"/output.txt"
+             # if test "x$ADM" = x ; then
-             else
+             #   cp output.txt $CDIR"/output.txt"
-                 cp output.txt_adm $CDIR"/output.txt_adm"
+             # else
-             fi
+             #   cp output.txt_adm $CDIR"/output.txt_adm"
+             # fi
+             if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
              return 0
          else
              tail run.log
              echo failed 1>&2
              cp run.log $CDIR"/run.log"
+             if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
              return 1
          fi
      )
-Line 432 
 createcodelet()
+Line 536 
 createcodelet()
  {
      # create codelet for comparing model output
-     echo -n "creating the comparison code...  "
+     printf "creating the comparison code...  "
      cat > tmp_cmpnum.c <<EOF
  #include <stdio.h>
  #include <math.h>
  int main( int argc, char** argv )  {
-   int linnum,best;
+   int linnum,best,lncnt;
-   double a,b,diff;
+   double a,b,abave,relerr;
-   best = -16;
+   best = -22;
-   while( 1 )  {
+   lncnt = 0;
+   while( 1 & (lncnt+=1) < 999 )  {
      scanf("%d", &linnum);
      if (linnum == -1)  break;
      scanf("%lf", &a);  scanf("%lf", &b);
-     diff = 0.5*(fabs(a)+fabs(b));
+     abave = 0.5*(fabs(a)+fabs(b));
-     if (diff > 1.e-12) {
+     if (abave > 0.0) {
-       diff=fabs(a-b)/diff;
+       relerr=fabs(a-b)/abave;
-       if (diff > 0.0) {
+       if (relerr > 0.0) { linnum = (int)rint(log10(relerr)); }
-         linnum = (int)log10(diff);
+       else { linnum = -16 ; }
-         best = (best > linnum) ? best : linnum;
+       best = (best > linnum) ? best : linnum;
-       }
-       else {
-         if (best == -16 && diff != 0)  best = -22;
-       }
      }
    }
+   if (lncnt == 999) best=-29;
    printf("%d\n", -best);
    return 0;
  }
  EOF
-     cc -o tmp_cmpnum tmp_cmpnum.c -lm
+     $CC -o tmp_cmpnum tmp_cmpnum.c -lm
      if [ -x ./tmp_cmpnum ]; then
          echo "OK"
          return 0
      else
          echo
-         echo "ERROR: failed to compile comparison code"
+         echo "ERROR: failed to compile comparison code -- please specify"
+         echo "  a C compiler using the CC environment variable."
          exit 1
      fi
  }
-Line 536 
 clean=0
+Line 639 
 clean=0
  expts=''
  # ieee=1
- IEEE=
+ IEEE=true
  if test "x$MITGCM_IEEE" != x ; then
      IEEE=$MITGCM_IEEE
  fi
-Line 547 
 QUICK=f
+Line 650 
 QUICK=f
  NOGENMAKE=f
  NOCLEAN=f
  NODEPEND=f
+ POSTCLEAN=f
  BASH=
  OPTFILE=NONE
-Line 556 
 MPACKDIR="../tools/mpack-1.6"
+Line 660 
 MPACKDIR="../tools/mpack-1.6"
  HAVE_MPACK=
  MPACK="$MPACKDIR/mpack"
  COMMAND=
- MAKE=make
+ if test "x$MAKE" = x ; then
+     MAKE=make
+ fi
+ if test "x$CC" = x ; then
+     CC=cc
+ fi
+ JOBS=
  MPI=f
+ DELDIR=
  ADM=
- echo -n "parsing options...  "
+ # Additional monitor types
+ PTRACERS_NUM="1 2 3 4 5"
+ printf "parsing options...  "
  ac_prev=
  for ac_option ; do
-Line 610 
 for ac_option ; do
+Line 724 
 for ac_option ; do
          -make=* | --make=*)
              MAKE=$ac_optarg ;;
+         -ptracers | --ptracers | -ptr | --ptr)
+             ac_prev=PTRACERS_NUM ;;
+         -ptracers=* | --ptracers=* | -ptr=* | --ptr=*)
+             PTRACERS_NUM=$ac_optarg ;;
+         -j) ac_prev=JOBS ;;
+         -j=*) JOBS=$ac_optarg ;;
          -clean | --clean)
-             CLEANUP=t ;;
+             CLEANUP=t ; DELDIR=t ;;
          -quick | --quick | -q | --q)
              QUICK=t ;;
-Line 622 
 for ac_option ; do
+Line 744 
 for ac_option ; do
          -nodepend | --nodepend | -nd | --nd)
              NODEPEND=t ;;
+         -postclean | --postclean | -pc | --pc)
+             POSTCLEAN=t ;;
          -mpi) MPI=t ;;
          -adm | -ad) ADM=t ;;
-Line 633 
 for ac_option ; do
+Line 758 
 for ac_option ; do
          -debug) debug=1 ;;
          -quiet) verbose=0 ;;
+         -deldir | -dd) DELDIR=t ;;
          -*)
              echo "Error: unrecognized option: "$ac_option
              usage
-Line 666 
 if test "x$ADM" = xt -a "x$COMMAND" = x
+Line 793 
 if test "x$ADM" = xt -a "x$COMMAND" = x
  fi
  if test "x$COMMAND" = x ; then
-     COMMAND="make output.txt"
+     COMMAND="$MAKE output.txt"
  fi
  echo "OK"
-Line 675 
 echo "OK"
+Line 802 
 echo "OK"
  createcodelet
  #  build the mpack utility
- build_mpack
+ if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
+     echo "skipping mpack build"
+ else
+     build_mpack
+ fi
  #  Create a uniquely named directory to store results
  MACH=`hostname`
-Line 695 
 if test "x$RETVAL" != x0 ; then
+Line 826 
 if test "x$RETVAL" != x0 ; then
      exit 1
  fi
  SUMMARY="$DRESULTS/summary.txt"
- echo -n "Start time:  " >> $SUMMARY
+ printf "Start time:  " >> $SUMMARY
  start_date=`date`
  echo $start_date > $SUMMARY
-Line 727 
 fi
+Line 858 
 fi
  echo
  echo >> $SUMMARY
  if test "x$ADM" = x ; then
-     cat << EOF | tee -a $SUMMARY
+     line_0="            ----T-----  ----S-----  ----U-----  ----V-----"
-                 T           S           U           V
+     line_1="G D M    c        m  s        m  s        m  s        m  s"
- 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  ."
- 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"
- N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d
+     line_4="2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  ."
-d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  .
+     for ii in $PTRACERS_NUM ; do
+         #  tst=`eval 'echo $HAVE_PTR0'$ii`
- EOF
+         #  if test "x$tst" = xt ; then
+         line_0="$line_0  --PTR 0"$ii"--"
+         line_1="$line_1        m  s"
+         line_2="$line_2  m  m  e  ."
+         line_3="$line_3  i  a  a  d"
+         line_4="$line_4  n  x  n  ."
+         #  fi
+     done
+     echo "$line_0" | tee -a $SUMMARY
+     echo "$line_1" | tee -a $SUMMARY
+     echo "$line_2" | tee -a $SUMMARY
+     echo "$line_3" | tee -a $SUMMARY
+     echo "$line_4" | tee -a $SUMMARY
+     echo " "       | tee -a $SUMMARY
  else
      echo "ADJOINT=true" >> $SUMMARY
      echo >> $SUMMARY
-Line 758 
 for dir in $TESTDIRS ; do
+Line 902 
 for dir in $TESTDIRS ; do
          if test -r $dir/input/Makefile ; then
              ( cd $dir/input ; make CLEAN )
          fi
+         (
+             cd $dir
+             rm -rf tr_run.*
+         )
          continue
      fi
-Line 773 
 for dir in $TESTDIRS ; do
+Line 921 
 for dir in $TESTDIRS ; do
          echo "can't read \"$fout\" -- skipping $dir"
          continue
      fi
+     if test "x$ADM" = x ; then
+         check_for_add_mon_output  $fout
+     fi
+     # Check for additional types of monitor output
      builddir="input"
      rundir="input"
-Line 784 
 for dir in $TESTDIRS ; do
+Line 937 
 for dir in $TESTDIRS ; do
          linkdata $use_seperate_build $dir/$rundir
      fi
+     #  Check whether there are "extra runs" for this testdir
+     extra_runs=
+     if test "x$ADM" = x -a "x$use_seperate_build" = x1 ; 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.txt.$name"
+             if test -f $outf -a -r $outf ; then
+                 extra_runs="$extra_runs $name"
+             fi
+         done
+     fi
      if test "x$ADM" = x ; then
          code_dir=code
          CODE_DIR=$dir/code
-Line 826 
 for dir in $TESTDIRS ; do
+Line 993 
 for dir in $TESTDIRS ; do
      echo
      if test "x$ADM" = x ; then
          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
+         echo
+         echo "$fres" >> $SUMMARY
+         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"
+         for ex in $extra_runs ; do
+             test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
+             for ldir in input.$ex input ; do
+                 (
+                     cd "$dir/$ldir" > /dev/null 2>&1
+                     ls -1 2>/dev/null \
+                         | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'
+                 ) > tr_exrun_links
+                 (
+                     cd "$dir/tr_run.$ex"
+                     cat ../../tr_exrun_links | while read i ; do
+                         if test ! "x$i" = x ; then
+                             test ! -r $i  &&  ln -s "../"$ldir"/"$i $i
+                         fi
+                     done
+                 )
+                 test -e tr_exrun_links  &&  rm -f tr_exrun_links
+             done
+             ldir=build
+             (
+                 cd "$dir/$ldir" > /dev/null 2>&1
+                 ls -1 Makefile *.[fFhco] mitgcmuv  2>/dev/null \
+                     | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'
+             ) > tr_exrun_links
+             (
+                 cd "$dir/tr_run.$ex"
+                     cat ../../tr_exrun_links | while read i ; do
+                         if test ! "x$i" = x ; then
+                             test ! -r $i  &&  ln -s "../"$ldir"/"$i $i
+                         fi
+                     done
+             )
+             test -e tr_exrun_links  &&  rm -f tr_exrun_links
+             runmodel $dir/tr_run.$ex && run=Y \
+                 && results=`testoutput $dir tr_run.$ex "."$ex`
+             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 "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"
+         done
      else
          fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
          fres=$fres"$results   $dir"
+         echo
+         echo "$fres" >> $SUMMARY
+         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
-     echo
-     echo "$fres" >> $SUMMARY
+     postclean $dir/$builddir
-     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"
      echo "-------------------------------------------------------------------------------"
  done
- echo -n "Start time:  " >> $SUMMARY
+ printf "Start time:  " >> $SUMMARY
  echo $start_date >> $SUMMARY
- echo -n "End time:    " >> $SUMMARY
+ printf "End time:    " >> $SUMMARY
  date >> $SUMMARY
  #  If addresses were supplied and mpack built successfully, then try
-Line 855 
 else
+Line 1078 
 else
      if test "x$HAVE_MPACK" = xt ; then
          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \
              && gzip $DRESULTS".tar" \
-             && $MPACK -s MITgcm-test -m 1500000 $DRESULTS".tar.gz" $ADDRESSES
+             && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESSES
          RETVAL=$?
          if test "x$RETVAL" != x0 ; then
              echo
-Line 878 
 fi
+Line 1101 
 fi
  rm -f tmp_cmpnum.c tmp_cmpnum
  if test "x$CLEANUP" != xt ; then
-     cat $SUMMARY
+     cat $SUMMARY | sed 's/ -- -- -- --//g'
      if test -e tr_out.txt ; then
          mv tr_out.txt tr_out.txt.old
      fi
-     cat $SUMMARY > tr_out.txt
+     cat $SUMMARY | sed 's/ -- -- -- --//g' > tr_out.txt
+ fi
+ if test "x$DELDIR" = xt ; then
+     rm -rf $DRESULTS
  fi

 Legend:



Removed from v.1.30
 


changed lines


 
Added in v.1.69
 Legend:



Removed from v.1.30
 


changed lines


 
Added in v.1.69
-Removed from v.1.30
+Added in v.1.69

	ViewVC Help
Powered by ViewVC 1.1.22