--- MITgcm/tools/example_scripts/csail/test_baudelaire	2016/01/29 14:15:28	1.22
+++ MITgcm/tools/example_scripts/csail/test_baudelaire	2016/06/29 16:27:23	1.27
@@ -1,9 +1,14 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/example_scripts/csail/test_baudelaire,v 1.22 2016/01/29 14:15:28 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/example_scripts/csail/test_baudelaire,v 1.27 2016/06/29 16:27:23 jmc Exp $
 
-#  Test script for MITgcm that should work on most of the csail.mit.edu
-#  Linux machines.
+#  Test script for MITgcm that should work on most of the csail.mit.edu Linux machines.
+
+tst_grp=0 ; if test $# = 1 ; then tst_grp=$1 ; fi
+if test $tst_grp != 'a' -a $tst_grp != 'b' ; then
+  echo "missing or invalid argument (expect: 'a' or 'b') ==> exit"
+  exit 1
+fi
 
 # defaults
 #export PATH="$PATH:/usr/local/bin"
@@ -32,17 +37,21 @@
 dInWeek=`date +%a`
 outDir=`hostname -s`
 TESTDIR="/scratch/jmc/test_${outDir}"
+outDir="${outDir}-${tst_grp}"
 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
-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
+if test $tst_grp = 'a' ; then
+ checkOut=2
+ tst_list='g7a mpa mth mp2+rs mpi oad'
+else
+ checkOut=3
+ tst_list='adm g77 gfo+rs ifc'
+ if test "x$dInWeek" = xSun ; then tst_list="$tst_list tlm" ; fi
+fi
+echo " test: $outDir ; list='$tst_list'"
 
 #option="-nc" ; checkOut=1
 #option="-q"  ; checkOut=1
@@ -92,7 +101,16 @@
   #- define list of additional experiences to test:
   addExp=''
   if test $typ = 'mp2' -o $typ = 'ifc' ; then
-    addExp='offline_cheapaml atm_gray'
+    addExp="offline_cheapaml atm_gray"
+  fi
+  if test $typ = 'gfo' -o $typ = 'ifc' ; then
+    addExp="$addExp global_oce_biogeo_bling"
+  fi
+  if test $typ = 'mpi' ; then
+    addExp="$addExp global_oce_cs32"
+  fi
+  if test $typ = 'gfo' ; then
+    addExp="$addExp shelfice_remeshing"
   fi
   #- check day and time:
   curDay=`date +%d` ; curHour=`date +%H`
@@ -143,6 +161,11 @@
         echo " add dir: $exp2add (from Contrib:verification_other)"
         ( cd verification ;  $cmdCVS co -P -d $exp2add \
              MITgcm_contrib/verification_other/$exp2add > /dev/null )
+        if test $exp2add = 'global_oce_cs32' ; then
+          echo " link dir 'other_input/gael_oce_cs32_input' to 'input_fields'"
+          ( cd verification/global_oce_cs32
+            ln -s ../../../other_input/gael_oce_cs32_input input_fields )
+        fi
       done
     fi
   else