/[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.32 by edhill, Sun Dec 7 07:06:13 2003 UTC revision 1.48 by jmc, Wed Nov 17 21:38:35 2004 UTC
# Line 13  usage() Line 13  usage()
13      echo "  (-help|-h)               print usage"      echo "  (-help|-h)               print usage"
14      echo "  (-mpi)                   use MPI input files"      echo "  (-mpi)                   use MPI input files"
15      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
16      echo "                             (DEF=\"noieee\")"      echo "                             (DEF=\"-ieee\")"
17      echo "  (-optfile=|-of=)STRING   list of optfiles to use"      echo "  (-optfile=|-of=)STRING   list of optfiles to use"
18      echo "  (-a|-addr) STRING        list of email recipients"      echo "  (-a|-addr) STRING        list of email recipients"
19      echo "                             (DEF=\"edhill@mitgcm.org\")"      echo "                             (DEF=\"edhill@mitgcm.org\")"
# Line 27  usage() Line 27  usage()
27      echo "                             (DEF=\"make output.txt\")"      echo "                             (DEF=\"make output.txt\")"
28      echo "  (-m|-make) STRING        command to use for \"make\""      echo "  (-m|-make) STRING        command to use for \"make\""
29      echo "                             (DEF=\"make\")"      echo "                             (DEF=\"make\")"
30        echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
31      echo "  (-clean)                 *ONLY* run \"make CLEAN\""      echo "  (-clean)                 *ONLY* run \"make CLEAN\""
32      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
33      echo "  (-nogenmake|-ng)         skip the genmake stage"      echo "  (-nogenmake|-ng)         skip the genmake stage"
34      echo "  (-noclean|-nc)           skip the \"make clean\" stage"      echo "  (-noclean|-nc)           skip the \"make clean\" stage"
35      echo "  (-nodepend|-nd)          skip the \"make depend\" stage"      echo "  (-nodepend|-nd)          skip the \"make depend\" stage"
36        echo "  (-deldir|-dd)            on success, delete the output directory"
37      echo      echo
38      echo "and where STRING follows a whitespace-delimited format"      echo "and where STRING follows a whitespace-delimited format"
39      echo "such as:"      echo "such as:"
# Line 44  usage() Line 46  usage()
46  #  build the mpack utility  #  build the mpack utility
47  build_mpack()  build_mpack()
48  {  {
49      echo -n "building the mpack utility...  "      printf "building the mpack utility...  "
50      if test ! -x "$MPACKDIR/mpack" ; then      if test ! -x "$MPACKDIR/mpack" ; then
51          if test ! -d $MPACKDIR ; then          if test ! -d $MPACKDIR ; then
52              echo              echo
# Line 54  build_mpack() Line 56  build_mpack()
56              echo              echo
57              HAVE_MPACK=f              HAVE_MPACK=f
58          fi          fi
59          echo -n "building mpack...  "          printf "building mpack...  "
60          if test "x$CC" = x ; then          if test "x$CC" = x ; then
61              export CC=cc              export CC=cc
62          fi          fi
# Line 77  build_mpack() Line 79  build_mpack()
79    
80  testoutput_for_prop()  testoutput_for_prop()
81  {  {
82      # testoutput_for_prop dir s1 label subdir      # testoutput_for_prop dir s1 label subdir extension
83      #      #
84      #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt      #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt
85      #  using search strings s1 and text label      #  using search strings s1 and text label
# Line 99  testoutput_for_prop() Line 101  testoutput_for_prop()
101          return 99          return 99
102      fi      fi
103      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
104          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
105      fi      fi
106      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
107      lncnt=`wc -l tmp2.txt | awk '{print $1}' `      lncnt=`wc -l tmp2.txt | awk '{print $1}' `
108      if [ $lncnt -lt 3 ]; then      if [ $lncnt -lt 3 ]; then
109          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
# Line 171  testoutput_ad() Line 173  testoutput_ad()
173    
174  testoutput()  testoutput()
175  {  {
176      # testoutput directory subdir      # testoutput directory subdir extension
177      #      #
178      #  test output in "directory"      #  test output in "directory"
179      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
180          if [ $debug -gt 0 ]; then          if [ $debug -gt 0 ]; then
181              echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2              echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2
182          fi          fi
183          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=$?
184          if [ $debug -gt 0 ]; then          if [ $debug -gt 0 ]; then
185              echo testoutput: cg2dres=$cg2dres 1>&2              echo testoutput: cg2dres=$cg2dres 1>&2
186          fi          fi
187          testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?          testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2 $3; tmin=$?
188          testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?          testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2 $3; tmax=$?
189          testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?          testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2 $3; tmean=$?
190          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=$?
191          testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$?          testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2 $3; smin=$?
192          testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$?          testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2 $3; smax=$?
193          testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$?          testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2 $3; smean=$?
194          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=$?
195          testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$?          testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2 $3; umin=$?
196          testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$?          testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2 $3; umax=$?
197          testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$?          testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2 $3; umean=$?
198          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=$?
199          testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$?          testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2 $3; vmin=$?
200          testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$?          testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2 $3; vmax=$?
201          testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$?          testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2 $3; vmean=$?
202          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=$?
203          dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \          dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \
204              $umin $umax $umean $usd $vmin $vmax $vmean $vsd              $umin $umax $umean $usd $vmin $vmax $vmean $vsd
205      else      else
# Line 211  genmakemodel() Line 213  genmakemodel()
213      if test "x$NOGENMAKE" = xt ; then      if test "x$NOGENMAKE" = xt ; then
214          echo "genmake skipped!"          echo "genmake skipped!"
215      else      else
216          GENMAKE2="$BASH ../../../tools/genmake2"          if test "x$BASH" = x ; then
217                GENMAKE2="../../../tools/genmake2"
218            else
219                GENMAKE2="$BASH ../../../tools/genmake2 -bash $BASH"
220            fi
221          (          (
222              cd $1;              cd $1;
223              command="$GENMAKE2  -ds -m $MAKE"              command="$GENMAKE2  -ds -m $MAKE"
# Line 230  genmakemodel() Line 236  genmakemodel()
236              printf 'genmake ... ' 1>&2              printf 'genmake ... ' 1>&2
237              $command > make.log 2>&1              $command > make.log 2>&1
238              RETVAL=$?              RETVAL=$?
239              cp Makefile $CDIR              #  Reduce the size of the testing emails!
240                head -100 Makefile > $CDIR/Makefile_head
241              if test "x$RETVAL" != x0 ; then              if test "x$RETVAL" != x0 ; then
242                  tail make.log                  tail make.log
243                  echo "genmakemodel: genmake failed" 1>&2                  echo "genmakemodel: genmake failed" 1>&2
# Line 302  makemodel() Line 309  makemodel()
309          if test -r Makefile ; then          if test -r Makefile ; then
310              printf 'make ... ' 1>&2              printf 'make ... ' 1>&2
311              if test "x$ADM" = x ; then              if test "x$ADM" = x ; then
312                  $MAKE >> make.log 2>&1                  if test "x$JOBS" = x ; then
313                        $MAKE >> make.log 2>&1
314                    else
315                        $MAKE -j $JOBS >> make.log 2>&1
316                    fi
317              else              else
318                  $MAKE adall >> make.log 2>&1                  $MAKE adall >> make.log 2>&1
319              fi              fi
# Line 329  symlink_mpifiles() Line 340  symlink_mpifiles()
340      code_dir=$2      code_dir=$2
341      BUILD_DIR=$dir/$3      BUILD_DIR=$dir/$3
342      CODE_DIR=$dir/$code_dir      CODE_DIR=$dir/$code_dir
343        
344      # These are files that should replace their counter-part when using -mpi      # These are files that should replace their counter-part when using -mpi
345      MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi")`      MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi")`
346    
# Line 344  symlink_mpifiles() Line 355  symlink_mpifiles()
355              RETVAL=$?              RETVAL=$?
356              if test "x$RETVAL" != x0 ; then              if test "x$RETVAL" != x0 ; then
357                  if ! test -f $BUILD_DIR/$i ; then                  if ! test -f $BUILD_DIR/$i ; then
358                  #echo Linking $name to $i                      #echo Linking $name to $i
359                      (cd $BUILD_DIR; ln -sf ../$code_dir/$i $name)                      (cd $BUILD_DIR; ln -sf ../$code_dir/$i $name)
360                  fi                  fi
361              fi              fi
362          done          done
363      else      else
364      # NO: We undo any _mpi symbolically linked files          # NO: We undo any _mpi symbolically linked files
365          for ii in $MPI_FILES ; do          for ii in $MPI_FILES ; do
366              i=`echo $ii | sed 's:^\./::'`              i=`echo $ii | sed 's:^\./::'`
367              name=`echo $i | sed 's:_mpi::' `              name=`echo $i | sed 's:_mpi::' `
368              if test -L $BUILD_DIR/$name ; then              if test -L $BUILD_DIR/$name ; then
369                  linktarg=`(cd $BUILD_DIR; readlink $name)`                  cmp $BUILD_DIR/$name "../$code_dir/$name"_mpi > /dev/null 2>&1
370                  if test $linktarg = "../$code_dir/$name"_mpi ; then                  RETVAL=$?
371                  #echo Un-linking $name from $linktarg                  if test "x$RETVAL" = x0 ; then
372                        #echo Un-linking $name from $linktarg
373                      rm -f $BUILD_DIR/$name                      rm -f $BUILD_DIR/$name
374                  fi                  fi
375              fi              fi
# Line 409  runmodel() Line 421  runmodel()
421          cd $1          cd $1
422          printf 'runmodel ... ' 1>&2          printf 'runmodel ... ' 1>&2
423          # make output.txt          # make output.txt
424          $COMMAND >> run.log 2>&1          echo
425            rm -f run.log
426            # echo "COMMAND='$COMMAND'"
427            # echo "pwd='"`pwd`"'"
428            ( eval $COMMAND ) > run.log 2>&1
429          RETVAL=$?          RETVAL=$?
430          if test "x$RETVAL" = x0 ; then          if test "x$RETVAL" = x0 ; then
431                tail run.log
432              echo successful 1>&2              echo successful 1>&2
433              if test "x$ADM" = x ; then              # === Reduce the size of the testing emails!
434                  cp output.txt $CDIR"/output.txt"              # if test "x$ADM" = x ; then
435              else              #   cp output.txt $CDIR"/output.txt"
436                  cp output.txt_adm $CDIR"/output.txt_adm"              # else
437              fi              #   cp output.txt_adm $CDIR"/output.txt_adm"
438                # fi
439                if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
440              return 0              return 0
441          else          else
442              tail run.log              tail run.log
443              echo failed 1>&2              echo failed 1>&2
444              cp run.log $CDIR"/run.log"              cp run.log $CDIR"/run.log"
445                if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
446              return 1              return 1
447          fi          fi
448      )      )
# Line 432  createcodelet() Line 452  createcodelet()
452  {  {
453      # create codelet for comparing model output      # create codelet for comparing model output
454    
455      echo -n "creating the comparison code...  "      printf "creating the comparison code...  "
456      cat > tmp_cmpnum.c <<EOF      cat > tmp_cmpnum.c <<EOF
457  #include <stdio.h>  #include <stdio.h>
458  #include <math.h>  #include <math.h>
459  int main( int argc, char** argv )  {  int main( int argc, char** argv )  {
460    int linnum,best;    int linnum,best,lncnt;
461    double a,b,diff;    double a,b,diff;
462    best = -16;    best = -16;
463    while( 1 )  {    lncnt = 0;
464      while( 1 & (lncnt+=1) < 999 )  {
465      scanf("%d", &linnum);      scanf("%d", &linnum);
466      if (linnum == -1)  break;      if (linnum == -1)  break;
467      scanf("%lf", &a);  scanf("%lf", &b);      scanf("%lf", &a);  scanf("%lf", &b);
# Line 456  int main( int argc, char** argv )  { Line 477  int main( int argc, char** argv )  {
477        }        }
478      }      }
479    }    }
480      if (lncnt == 999) best=-29;
481    printf("%d\n", -best);    printf("%d\n", -best);
482    return 0;    return 0;
483  }  }
# Line 536  clean=0 Line 558  clean=0
558  expts=''  expts=''
559  # ieee=1  # ieee=1
560    
561  IEEE=  IEEE=true
562  if test "x$MITGCM_IEEE" != x ; then  if test "x$MITGCM_IEEE" != x ; then
563      IEEE=$MITGCM_IEEE      IEEE=$MITGCM_IEEE
564  fi  fi
# Line 557  HAVE_MPACK= Line 579  HAVE_MPACK=
579  MPACK="$MPACKDIR/mpack"  MPACK="$MPACKDIR/mpack"
580  COMMAND=  COMMAND=
581  MAKE=make  MAKE=make
582    JOBS=
583  MPI=f  MPI=f
584    DELDIR=
585    
586  ADM=  ADM=
587    
588  echo -n "parsing options...  "  printf "parsing options...  "
589    
590  ac_prev=  ac_prev=
591  for ac_option ; do  for ac_option ; do
# Line 610  for ac_option ; do Line 634  for ac_option ; do
634          -make=* | --make=*)          -make=* | --make=*)
635              MAKE=$ac_optarg ;;              MAKE=$ac_optarg ;;
636    
637            -j) ac_prev=JOBS ;;
638            -j=*) JOBS=$ac_optarg ;;
639    
640          -clean | --clean)          -clean | --clean)
641              CLEANUP=t ;;              CLEANUP=t ;;
642    
# Line 633  for ac_option ; do Line 660  for ac_option ; do
660          -debug) debug=1 ;;          -debug) debug=1 ;;
661          -quiet) verbose=0 ;;          -quiet) verbose=0 ;;
662    
663            -deldir | -dd) DELDIR=t ;;
664    
665          -*)          -*)
666              echo "Error: unrecognized option: "$ac_option              echo "Error: unrecognized option: "$ac_option
667              usage              usage
# Line 666  if test "x$ADM" = xt -a "x$COMMAND" = x Line 695  if test "x$ADM" = xt -a "x$COMMAND" = x
695  fi  fi
696    
697  if test "x$COMMAND" = x ; then  if test "x$COMMAND" = x ; then
698      COMMAND="make output.txt"      COMMAND="$MAKE output.txt"
699  fi  fi
700    
701  echo "OK"  echo "OK"
# Line 699  if test "x$RETVAL" != x0 ; then Line 728  if test "x$RETVAL" != x0 ; then
728      exit 1      exit 1
729  fi  fi
730  SUMMARY="$DRESULTS/summary.txt"  SUMMARY="$DRESULTS/summary.txt"
731  echo -n "Start time:  " >> $SUMMARY  printf "Start time:  " >> $SUMMARY
732  start_date=`date`  start_date=`date`
733  echo $start_date > $SUMMARY  echo $start_date > $SUMMARY
734    
# Line 788  for dir in $TESTDIRS ; do Line 817  for dir in $TESTDIRS ; do
817          linkdata $use_seperate_build $dir/$rundir          linkdata $use_seperate_build $dir/$rundir
818      fi      fi
819            
820        #  Check whether there are "extra runs" for this testdir
821        extra_runs=
822        if test "x$ADM" = x -a "x$use_seperate_build" = x1 ; then
823            ex_run_dirs=`( cd $dir ; echo input.* )`
824            echo "ex_run_dirs='$ex_run_dirs'"
825            for exd in $ex_run_dirs ; do
826                name=`echo $exd | sed -e 's/input.//g'`
827                outf="$dir/results/output.txt.$name"
828                if test -f $outf -a -r $outf ; then
829                    extra_runs="$extra_runs $name"
830                fi
831            done
832        fi
833    
834      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
835          code_dir=code          code_dir=code
836          CODE_DIR=$dir/code          CODE_DIR=$dir/code
# Line 830  for dir in $TESTDIRS ; do Line 873  for dir in $TESTDIRS ; do
873      echo      echo
874      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
875          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
876            echo
877            echo "$fres" >> $SUMMARY
878            echo "fresults='$fres'" > $CDIR"/summary.txt"
879            echo "MACH='$MACH'" >> $CDIR"/summary.txt"
880            echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
881            echo "DATE='$DATE'" >> $CDIR"/summary.txt"
882            echo "tdir='$dir'" >> $CDIR"/summary.txt"
883    
884            OLD_COMMAND=$COMMAND
885            COMMAND="./mitgcmuv > output.txt"
886            for ex in $extra_runs ; do
887                test -e "$dir/tr_run.$ex" && rm -rf "$dir/tr_run.$ex"
888                mkdir "$dir/tr_run.$ex"
889                links=`( cd "$dir/input" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
890                (
891                    cd "$dir/tr_run.$ex"
892                    for i in $links; do
893                        ln -s ../input/$i $i
894                    done
895                )
896                links=`( cd "$dir/input.$ex" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
897                (
898                    cd "$dir/tr_run.$ex"
899                    for i in $links; do
900                        test -e $i  &&  rm -f $i
901                        ln -s ../input.$ex/$i $i
902                    done
903                    ln -s ../$builddir/mitgcmuv mitgcmuv
904                )
905                runmodel $dir/tr_run.$ex && run=Y \
906                    && results=`testoutput $dir tr_run.$ex "."$ex`
907                fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
908                fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
909                fres="$fres.$ex"
910                echo
911                echo "$fres" >> $SUMMARY
912                echo "fresults='$fres'" > $CDIR"/summary.txt"
913                echo "MACH='$MACH'" >> $CDIR"/summary.txt"
914                echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
915                echo "DATE='$DATE'" >> $CDIR"/summary.txt"
916                echo "tdir='$dir'" >> $CDIR"/summary.txt"
917            done
918            COMMAND=$OLD_COMMAND
919      else      else
920          fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`          fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
921          fres=$fres"$results   $dir"          fres=$fres"$results   $dir"
922            echo
923            echo "$fres" >> $SUMMARY
924            echo "fresults='$fres'" > $CDIR"/summary.txt"
925            echo "MACH='$MACH'" >> $CDIR"/summary.txt"
926            echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
927            echo "DATE='$DATE'" >> $CDIR"/summary.txt"
928            echo "tdir='$dir'" >> $CDIR"/summary.txt"
929      fi      fi
     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"  
930            
931      echo "-------------------------------------------------------------------------------"      echo "-------------------------------------------------------------------------------"
932            
933  done  done
934    
935  echo -n "Start time:  " >> $SUMMARY  printf "Start time:  " >> $SUMMARY
936  echo $start_date >> $SUMMARY  echo $start_date >> $SUMMARY
937  echo -n "End time:    " >> $SUMMARY  printf "End time:    " >> $SUMMARY
938  date >> $SUMMARY  date >> $SUMMARY
939    
940  #  If addresses were supplied and mpack built successfully, then try  #  If addresses were supplied and mpack built successfully, then try
# Line 859  else Line 945  else
945      if test "x$HAVE_MPACK" = xt ; then      if test "x$HAVE_MPACK" = xt ; then
946          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \
947              && gzip $DRESULTS".tar" \              && gzip $DRESULTS".tar" \
948              && $MPACK -s MITgcm-test -m 1500000 $DRESULTS".tar.gz" $ADDRESSES              && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESSES
949          RETVAL=$?          RETVAL=$?
950          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
951              echo              echo
# Line 889  if test "x$CLEANUP" != xt ; then Line 975  if test "x$CLEANUP" != xt ; then
975      cat $SUMMARY > tr_out.txt      cat $SUMMARY > tr_out.txt
976  fi  fi
977    
978    if test "x$DELDIR" = xt ; then
979        rm -rf $DRESULTS
980    fi
981    
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.48
  ViewVC Help
Powered by ViewVC 1.1.22