--- MITgcm/verification/testreport	2010/03/04 21:26:27	1.135
+++ MITgcm/verification/testreport	2010/03/08 16:36:20	1.136
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.135 2010/03/04 21:26:27 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.136 2010/03/08 16:36:20 jmc Exp $
 #  $Name:  $
 #
 
@@ -13,38 +13,38 @@
     echo "  (-help|-h)               print usage"
     echo "  (-mth)                   run multi-threaded (using eedata.mth)"
     echo "  (-mpi)                   compile and run using MPI"
-    echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
+    echo "  (-ieee/-noieee)          if possible, use IEEE compiler flags"
     echo "                             (DEF=\"-ieee\")"
     echo "  (-gsl)                   compile with \"-gsl\" flag"
-    echo "  (-ur4|-use_r4)           if allowed, use real*4 type for '_RS' variable"
-    echo "  (-of=|-optfile=)STRING   list of optfiles to use"
-    echo "  (-a|-addr) STRING        list of email recipients"
+    echo "  (-use_r4|-ur4)           if allowed, use real*4 type for '_RS' variable"
+    echo "  (-optfile|-of) STRING    list of optfiles to use"
+    echo "  (-addr|-a) STRING        list of email recipients"
     echo "                             (DEF=\"\" no email is sent)"
-    echo "  (-mpd|-mpackdir) DIR     location of the mpack utility"
+    echo "  (-mpackdir|-mpd) DIR     location of the mpack utility"
     echo "                             (DEF=\"../tools/mpack-1.6\")"
-    echo "  (-t|-tdir) STRING        list of group and/or exp. dirs to test"
+    echo "  (-tdir|-t) STRING        list of group and/or exp. dirs to test"
     echo "                             (recognized groups: basic, tutorials)"
     echo "                             (DEF=\"\" which test all)"
-    echo "  (-skd|-skipdir) STRING   list of exp. dirs to skip"
+    echo "  (-skipdir|-skd) STRING   list of exp. dirs to skip"
     echo "                             (DEF=\"\" which test all)"
-    echo "  (-b|-bash) STRING        preferred location of a \"bash\" or"
+    echo "  (-bash|-b) STRING        preferred location of a \"bash\" or"
     echo "                             Bourne-compatible \"sh\" shell"
     echo "                             (DEF=\"\" for \"bash\")"
     echo "  (-adm|-ad)               perform an adjoint run"
     echo "  (-oad)                   perform an OpenAD adjoint run"
-    echo "  (-command) STRING        command to run"
-    echo "                             (DEF=\"make output.txt\")"
-    echo "  (-m|-make) STRING        command to use for \"make\""
+    echo "  (-command|-c) STRING     command to run"
+    echo "  (-make|-m) STRING        command to use for \"make\""
     echo "                             (DEF=\"make\")"
     echo "  (-odir) STRING           used to build output directory name"
     echo "                             (DEF=\"hostname\")"
-    echo "  (-ptr|-ptracers) STRING  specify which ptracers to test"
+    echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"
     echo "                             (DEF=\"1 2 3 4 5\")"
     echo "  (-match) NUMBER          Matching Criteria (number of digits)"
     echo "                             (DEF=\"12\")"
     echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
     echo "  (-clean)                 *ONLY* run \"make CLEAN\""
     echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
+    echo "  (-runonly|-ro)           *ONLY* run stage (=\"-quick\" without make)"
     echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
     echo "  (-nogenmake|-ng)         skip the genmake stage"
     echo "  (-noclean|-nc)           skip the \"make clean\" stage"
@@ -449,6 +449,15 @@
 {
     # makemodel directory
     (
+    if test "x$NOMAKE" = xt ; then
+	cd $1;
+	if test -x $EXECUTABLE ; then
+	    echo "make skipped!"
+	else
+	    echo "no executable!"
+	    return 2
+	fi
+    else
 	cd $1;
 	if test -r Makefile ; then
 	    printf 'make ... ' 1>&2
@@ -474,6 +483,7 @@
 		echo successful 1>&2
 	    fi
 	fi
+    fi
     )
 }
 
@@ -801,6 +811,7 @@
 CLEANUP=f
 NORUN=f
 QUICK=f
+NOMAKE=f
 NOGENMAKE=f
 NOCLEAN=f
 NODEPEND=f
@@ -862,7 +873,7 @@
 	
 	-addr | --addr | -a | --a)
             ac_prev=ADDRESSES ;;
-        -addr=* | --addr=*)
+        -addr=* | --addr=* | -a=* | --a=*)
             ADDRESSES=$ac_optarg ;;
         -mpackdir | --mpackdir | -mpd | --mpd)
             ac_prev=MPACKDIR ;;
@@ -871,27 +882,27 @@
 
 	-tdir | --tdir | -t | --t)
             ac_prev=TESTDIRS ;;
-        -tdir=* | --tdir=*)
+        -tdir=* | --tdir=* | -t=* | --t=*)
             TESTDIRS=$ac_optarg ;;
 
 	-skipdir | --skipdir | -skd | --skd)
             ac_prev=SKIPDIRS ;;
-        -skipdir=* | --skipdir=*)
+        -skipdir=* | --skipdir=* | -skd=* | --skd=*)
             SKIPDIRS=$ac_optarg ;;
 
 	-bash | --bash | -b | --b)
             ac_prev=BASH ;;
-        -bash=* | --bash=*)
+        -bash=* | --bash=* | -b=* | --b=*)
             BASH=$ac_optarg ;;
 
 	-command | --command | -c | --c)
 	    ac_prev=COMMAND ;;
-	-command=* | --command=*)
+	-command=* | --command=* | -c=* | --c=*)
 	    COMMAND=$ac_optarg ;;
 
 	-make | --make | -m | --m)
 	    ac_prev=MAKE ;;
-	-make=* | --make=*)
+	-make=* | --make=* | -m=* | --m=*)
 	    MAKE=$ac_optarg ;;
 
         -odir | --odir)
@@ -907,14 +918,16 @@
 	-match | --match ) ac_prev=MATCH_CRIT ;;
 	-match=* | --match=* ) MATCH_CRIT=$ac_optarg ;;
 
-	-j) ac_prev=JOBS ;;
-	-j=*) JOBS=$ac_optarg ;;
+	-j | --j) ac_prev=JOBS ;;
+	-j=* | --j=*) JOBS=$ac_optarg ;;
 
 	-clean | --clean)
 	    CLEANUP=t ; DELDIR=t ;;
 
 	-norun | --norun | -nr | --nr)
 	    NORUN=t ;;
+	-runonly | --runonly | -ro | --ro)
+	    QUICK=t ; NOMAKE=t ;;
 	-quick | --quick | -q | --q)
 	    QUICK=t ;;
 	-nogenmake | --nogenmake | -ng | --ng)
@@ -945,7 +958,7 @@
 
 	-deldir | -dd) DELDIR=t ;;
 
-	-ur4|-use_r4) USE_R4=t ;;
+	-use_r4|-ur4) USE_R4=t ;;
 
 	-ts) TS=t;;
 	-papis) PAPIS=t;;