--- MITgcm/tools/example_scripts/csail/test_baudelaire	2013/06/28 15:38:19	1.19
+++ MITgcm/tools/example_scripts/csail/test_baudelaire	2013/11/25 14:42:49	1.20
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/example_scripts/csail/test_baudelaire,v 1.19 2013/06/28 15:38:19 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/example_scripts/csail/test_baudelaire,v 1.20 2013/11/25 14:42:49 jmc Exp $
 
 #  Test script for MITgcm that should work on most of the csail.mit.edu
 #  Linux machines.
@@ -26,18 +26,23 @@
 cmdCVS='cvs -d /u/gcmpack'
 
 # checkOut=2 : download new code ;
+#   =3 : skip download but, if sepDir, use a new copy
 #   =1 : update code       (if no existing code -> swith to 2)
 #   =0 : use existing code (if no existing code -> swith to 2)
 dInWeek=`date +%a`
-TESTDIR="/scratch/jmc/test_"`hostname -s`
+outDir=`hostname -s`
+TESTDIR="/scratch/jmc/test_${outDir}"
 MC=13
 checkOut=2
 sepDir=1
 option=
-tst_list='g7a adm mpa g77 gfo+rs mth mp2+rs mpi ifc'
-if test "x$dInWeek" = xSun ; then tst_list="$tst_list tlm oad" ; fi
-#tst_list='g77 adm gfo ifc mth pgi+rs'
-#tst_list='g77 gfo+rs mth'
+#tst_list='g7a adm mpa g77 gfo+rs mth mp2+rs mpi ifc'
+#if test "x$dInWeek" = xSun ; then tst_list="$tst_list tlm oad" ; fi
+outDir="${outDir}-a"
+tst_list='g7a mpa mth mp2+rs mpi oad'
+#outDir="${outDir}-b"
+#tst_list='adm g77 gfo+rs ifc'
+#if test "x$dInWeek" = xSun ; then tst_list="$tst_list tlm" ; fi
 
 #option="-nc" ; checkOut=1
 #option="-q"  ; checkOut=1
@@ -103,7 +108,8 @@
   touch $tdir/output_$tt
   if test $sepDir = 1 ; then
     new_dir="MITgcm_$typ"
-    if test -d $new_dir/CVS -a $checkOut != 2 ; then
+    reUse=1 ; if [ $checkOut -ge 2 ] ; then reUse=0 ; fi
+    if test -d $new_dir/CVS -a $reUse = 1 ; then
       pushd $new_dir
       if test $tt != $typ ; then
         ( cd verification ; ../tools/do_tst_2+2 -clean )
@@ -139,14 +145,15 @@
   else
     comm="$comm -md cyrus-makedepend"
   fi
-  comm="$comm -a jmc@mitgcm.org"
+  comm="$comm -odir $outDir -a jmc@mitgcm.org"
 #-- set the optfile (+ mpi & match-precision)
   MPI=0
   case $typ in
    'g77'|'g7a')		OPTFILE='../tools/build_options/linux_amd64_g77' ;;
    'gfo'|'adm'|'oad'|'tlm'|'mth') comm="$comm -match $MC -devel"
 			OPTFILE='../tools/build_options/linux_amd64_gfortran' ;;
-   'ifc')		OPTFILE='../tools/build_options/linux_amd64_ifort11' ;;
+   'ifc')		comm="$comm -devel"
+			OPTFILE='../tools/build_options/linux_amd64_ifort11' ;;
    'pgi')		OPTFILE='../tools/build_options/linux_amd64_pgf77' ;;
    'mpa'|'mpi'|'mp2')	comm="$comm -match $MC -devel" ; MPI=6
 			OPTFILE='../tools/build_options/linux_amd64_gfortran' ;;
@@ -208,7 +215,7 @@
   if test $tt != $typ
   then
     echo "testing restart using:"	| tee -a $tdir/output_$tt
-    comm="../tools/do_tst_2+2 -a jmc@mitgcm.org"
+    comm="../tools/do_tst_2+2 -o $outDir -a jmc@mitgcm.org"
     if test $MPI = 0 ; then
       echo "  \"$comm\""		| tee -a $tdir/output_$tt
       echo "======================"