/[MITgcm]/MITgcm/tools/do_tst_2+2

Diff of /MITgcm/tools/do_tst_2+2

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

-revision 1.12 by jmc,
Wed May 18 14:23:57 2011 UTC
+revision 1.20 by jmc,
Fri Oct 23 23:11:50 2015 UTC
 Line 20 
 usage()
          echo "  -a,-A  STRING : email address to send output to"
          echo "                      (DEF=\"\" no email is sent)"
          echo "                      (-A: + save each log file)"
+         echo "  -send  STRING : sending command (instead of using mpack)"
+         echo "  -sd    STRING : location to save output tar file to send (DEF='$SAVDIR')"
          echo "  -clean        : clean output & reset"
          exit
  }
-Line 28 
 CLEAN=0
+Line 30 
 CLEAN=0
  TESTDIRS=
  SKIPDIRS=
  SCRIPT='../tools/tst_2+2'
- LOGFILE='tst_2+2_outp.log'
+ LOGFILE='tst_2+2_out.log'
  scrArg='All'
+ bldDir='build'
  COMMAND=
  mpi=0
  MPI_MFILE=
- OUTDIR=`hostname | sed 's/\..*$//'`
+ OUTDIR=`hostname -s | tr '[:upper:]' '[:lower:]'`
  SAVELOG=0
  ADDRESS=
  MPACK="../tools/mpack-1.6/mpack"
+ SENDCMD=
+ SAVDIR='.'
  here=`pwd`
  yy=
  for xx
-Line 55 
 do
+Line 60 
 do
        -mf   ) yy=MPI_MFILE ;;
        -a    ) yy=ADDRESS ;;
        -A    ) yy=ADDRESS ; SAVELOG=1 ;;
+       -send ) yy=SENDCMD ;;
+       -sd   ) yy=SAVDIR ;;
        -o    ) yy=OUTDIR ;;
          *) echo "Error: unrecognized option: "$xx ; usage ; exit ;;
        esac
-Line 79 
 do
+Line 86 
 do
  done
  if test -x $SCRIPT ; then
-  echo "run script '$SCRIPT' for experiment in:"
+  if test $CLEAN = 1 ; then
+    echo "clean output from script '$SCRIPT' for experiment in:"
+  else
+    echo "run script '$SCRIPT' for experiment in:"
+  fi
   echo " $LIST"
+  echo ""
   yy=`echo $SCRIPT | grep -c '^\/'`
   if test $yy = 0 ; then SCRIPT="../../$SCRIPT" ; fi
  else
   echo "ERROR: script '$SCRIPT' not found or not executable"
   exit
  fi
- echo ""
  #------------------------
  if test $CLEAN = 1 ; then
-Line 115 
 for xx in "$@" ; do nw=`echo $xx | wc -w
+Line 126 
 for xx in "$@" ; do nw=`echo $xx | wc -w
      if test $nw = '1' ; then CMDLINE="$CMDLINE $xx"
                          else CMDLINE="$CMDLINE '$xx'" ; fi
  done
- #for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done
+ DATE=''
- DATE=`date +%Y%m%d`
+ if test -f tr_out.txt ; then
+ #  try to use the date corresponding to 'Start time:' in file "tr_out.txt" :
+   sTime=`grep '^Start time:  ' tr_out.txt 2>/dev/null | sed 's/Start time:  //'`
+   if test "x$sTime" != x ; then DATE=`date -d "$sTime" "+%Y%m%d" 2>/dev/null` ; fi
+ fi
+ #  otherwise, use current date:
+ if test "x$DATE" = x ; then DATE=`date +%Y%m%d`; fi
  BASE="rs_"$OUTDIR"_"$DATE"_"
  xx=0
  DRESULTS="$BASE$xx"
-Line 152 
 RUNOUTP="output.txt"
+Line 169 
 RUNOUTP="output.txt"
  if [ $mpi -ge 1 ] ; then
    SCRIPT="$SCRIPT -mpi"
    RUNOUTP="STDOUT.0000"
+   if test "x$COMMAND" = x ; then COMMAND="mpirun -v -np TR_NPROC ./mitgcmuv" ; fi
  fi
  for xx in $LIST
  do
-   echo ==============================================================================
+   echo '------------------------------------------------------------------------------'
    if [ $mpi -le 0 ] ; then
      rCommand=$COMMAND
    else
      LOC_NPROC=2
-     mpi_size=$xx/build/SIZE.h.mpi
+     mpi_size=$xx/$bldDir/SIZE.h.mpi
      if test -f $mpi_size ; then
        px=`grep '^     & *nPx *=' $mpi_size | sed 's/^     & *nPx *= *//' | sed 's/, *$//'`
        py=`grep '^     & *nPy *=' $mpi_size | sed 's/^     & *nPy *= *//' | sed 's/, *$//'`
-Line 186 
 do
+Line 204 
 do
    for yy in $listD
    do
      if test -f $xx/$yy/$RUNOUTP ; then
-       if test "x$OPTFILE" = x -a -f $xx/build/Makefile ; then
+       if test "x$OPTFILE" = x -a -f $xx/$bldDir/Makefile ; then
-         comm=`grep '^# OPTFILE=' $xx/build/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
+         comm=`grep '^# OPTFILE=' $xx/$bldDir/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
-         echo "from '$xx/build/Makefile', extract:" > $DRESULTS/genmake_state
+         echo "from '$xx/$bldDir/Makefile', extract:" > $DRESULTS/genmake_state
-         sed -n '/^# executed by:/,+1 p' $xx/build/Makefile >> $DRESULTS/genmake_state
+         sed -n '/^# executed by:/,+1 p' $xx/$bldDir/Makefile >> $DRESULTS/genmake_state
          echo " $comm" >> $DRESULTS/genmake_state
          eval $comm
-         gmkLog=$xx/build/genmake.log
+         gmkLog=$xx/$bldDir/genmake.log
          grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1
          out=$?
          if test "x$out" = x0 ; then
-Line 245 
 done
+Line 263 
 done
  printf "End time:    " >> $SUMMARY
  date >> $SUMMARY
- #  If address was supplied and mpack exist, then send email using mpack.
+ #  If address was supplied, then send email using Send-Command or mpack.
  if test "x$ADDRESS" != xNONE -a "x$ADDRESS" != x ; then
-     if test -x $MPACK ; then
+     if test "x$SENDCMD" = x ; then
-         tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \
+       # if Send-Command is empty and mpack exist, then send email using mpack.
-             && gzip $DRESULTS".tar" \
+       if test -x $MPACK ; then SENDCMD=$MPACK
-             && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESS
+       else
+         echo "Warning: $MPACK is not executable => no email was sent"
+         echo
+       fi
+     fi
+     if test "x$SENDCMD" != x ; then
+         #echo " run: $SENDCMD -s MITgcm-test -m 3555000  ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESS"
+         tar -cf  ${SAVDIR}/${DRESULTS}".tar" $DRESULTS > /dev/null 2>&1 \
+             && gzip  ${SAVDIR}/${DRESULTS}".tar" \
+             && $SENDCMD -s MITgcm-test -m 3555000  ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESS
          out=$?
          if test "x$out" != x0 ; then
              echo
-Line 264 
 if test "x$ADDRESS" != xNONE -a "x$ADDRE
+Line 291 
 if test "x$ADDRESS" != xNONE -a "x$ADDRE
              echo "  \"$ADDRESS\""
              echo
          fi
-         test -f $DRESULTS".tar"  &&  rm -f $DRESULTS".tar"
+         test -f ${SAVDIR}/${DRESULTS}".tar" &&  rm -f ${SAVDIR}/${DRESULTS}".tar"
-         test -f $DRESULTS".tar.gz"  &&  rm -f $DRESULTS".tar.gz"
+         test -f ${SAVDIR}/${DRESULTS}".tar.gz" &&  rm -f ${SAVDIR}/${DRESULTS}".tar.gz"
-     else
-         echo "Warning: $MPACK is not executable => no email was sent"
-         echo
      fi
  fi
-Line 279 
 cp -p $SUMMARY tst_2+2_out.txt
+Line 303 
 cp -p $SUMMARY tst_2+2_out.txt
  if test "x$ADDRESS" = x ; then
    rm -rf $DRESULTS
  fi

 Legend:



Removed from v.1.12
 


changed lines


 
Added in v.1.20
 Legend:



Removed from v.1.12
 


changed lines


 
Added in v.1.20
-Removed from v.1.12
+Added in v.1.20

	ViewVC Help
Powered by ViewVC 1.1.22