/[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.43 by edhill, Thu Jul 8 20:58:24 2004 UTC revision 1.47 by edhill, Tue Aug 3 02:48:57 2004 UTC
# Line 236  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 339  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 354  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 420  runmodel() Line 422  runmodel()
422          printf 'runmodel ... ' 1>&2          printf 'runmodel ... ' 1>&2
423          # make output.txt          # make output.txt
424          echo          echo
425            rm -f run.log
426          # echo "COMMAND='$COMMAND'"          # echo "COMMAND='$COMMAND'"
427          # echo "pwd='"`pwd`"'"          # echo "pwd='"`pwd`"'"
428          ( eval $COMMAND ) >> run.log 2>&1          ( 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              return 0              return 0
440          else          else
441              tail run.log              tail run.log
# Line 688  if test "x$ADM" = xt -a "x$COMMAND" = x Line 693  if test "x$ADM" = xt -a "x$COMMAND" = x
693  fi  fi
694    
695  if test "x$COMMAND" = x ; then  if test "x$COMMAND" = x ; then
696      COMMAND="make output.txt"      COMMAND="$MAKE output.txt"
697  fi  fi
698    
699  echo "OK"  echo "OK"
# Line 938  else Line 943  else
943      if test "x$HAVE_MPACK" = xt ; then      if test "x$HAVE_MPACK" = xt ; then
944          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \
945              && gzip $DRESULTS".tar" \              && gzip $DRESULTS".tar" \
946              && $MPACK -s MITgcm-test -m 1500000 $DRESULTS".tar.gz" $ADDRESSES              && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESSES
947          RETVAL=$?          RETVAL=$?
948          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
949              echo              echo
Legend:
Removed from v.1.43  
changed lines
  Added in v.1.47
  ViewVC Help
Powered by ViewVC 1.1.22