--- MITgcm/verification/testreport	2003/09/16 18:16:03	1.9
+++ MITgcm/verification/testreport	2003/10/03 16:03:00	1.9.2.5
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.9 2003/09/16 18:16:03 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.9.2.5 2003/10/03 16:03:00 edhill Exp $
 #
 
 usage()
@@ -22,6 +22,10 @@
     echo "                             (DEF=\"make output.txt\")"
     echo "  (-m|-make)STRING         command to use for \"make\""
     echo "                             (DEF=\"make\")"
+    echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
+    echo "  (-nogenmake|-ng)         skip the genmake stage"
+    echo "  (-noclean|-nc)           skip the \"make clean\" stage"
+    echo "  (-nodepend|-nd)          skip the \"make depend\" stage"
     echo
     echo "and where STRING follows a whitespace-delimited format"
     echo "such as:"
@@ -174,70 +178,82 @@
 genmakemodel()
 {
     # genmakemodel directory
-    GENMAKE2="$BASH ../../../tools/genmake2"
-    (
-	cd $1;
-	printf 'genmake ... ' 1>&2
-        # ../../../tools/genmake -ieee -mods=../code > make.log 2>&1
-	$GENMAKE2  -ds -m $MAKE --mods=../code "--optfile="$OPTFILE > make.log 2>&1
-	RETVAL=$?
-	for i in gm_state gm_optfile gm_local Makefile ; do
-	    if test -r $i ; then
-		cp $i $CDIR
+    if test "x$NOGENMAKE" = xt ; then
+	echo "genmake skipped!"
+    else
+	GENMAKE2="$BASH ../../../tools/genmake2"
+	(
+	    cd $1;
+	    printf 'genmake ... ' 1>&2
+            # ../../../tools/genmake -ieee -mods=../code > make.log 2>&1
+	    $GENMAKE2  -ds -m $MAKE --mods=../code "--optfile="$OPTFILE > make.log 2>&1
+	    RETVAL=$?
+	    for i in gm_state gm_optfile gm_local Makefile ; do
+		if test -r $i ; then
+		    cp $i $CDIR
+		fi
+	    done
+	    if test "x$RETVAL" != x0 ; then
+		tail make.log
+		echo "genmakemodel: genmake failed" 1>&2
+		cp make.log $CDIR
+		return 1
+	    else
+		echo "succesful" 1>&2
 	    fi
-	done
-	if test "x$RETVAL" != x0 ; then
-	    tail make.log
-	    echo "genmakemodel: genmake failed" 1>&2
-	    cp make.log $CDIR
-	    return 1
-	else
-	    echo "succesful" 1>&2
-	fi
-    )
+	)
+    fi
 }
 
 makeclean()
 {
     # makeclean directory
-    (
-	cd $1;
-	if test -e output.txt ; then
-	    rm -f output.txt
-	fi
-	printf 'make CLEAN ... ' 2>&1
-	if test -r Makefile ; then
-	    $MAKE CLEAN >> make.log 2>&1
-	    RETVAL=$?
-	    if test "x$RETVAL" != x0 ; then
-		tail make.log
-		echo "makeclean: \"make CLEAN\" failed" 1>&2
-		cp make.log $CDIR"/make.log"
-		return 1
+    if test "x$NOCLEAN" = xt ; then
+	echo "make CLEAN skipped!"
+    else
+	(
+	    cd $1;
+	    if test -e output.txt ; then
+		rm -f output.txt
 	    fi
-	fi
-	echo succesful 1>&2
-	exit 0
-    )
+	    printf 'make CLEAN ... ' 2>&1
+	    if test -r Makefile ; then
+		$MAKE CLEAN >> make.log 2>&1
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		    tail make.log
+		    echo "makeclean: \"make CLEAN\" failed" 1>&2
+		    cp make.log $CDIR"/make.log"
+		    return 1
+		fi
+	    fi
+	    echo succesful 1>&2
+	    exit 0
+	)
+    fi
 }
 
 makedependmodel()
 {
     # makedependmodel directory
-    (
-	cd $1;
-	printf 'make depend ... ' 1>&2
-	$MAKE depend >> make.log 2>&1
-	RETVAL=$?
-	if test "x$RETVAL" != x0 ; then
-	    tail make.log
-	    echo "makedependmodel: make depend failed" 1>&2
-	    cp make.log $CDIR"/make.log"
-	    return 1
-	else
-	    echo succesful 1>&2
-	fi
-    )
+    if test "x$NODEPEND" = xt ; then
+	echo "make depend skipped!"
+    else
+	(
+	    cd $1;
+	    printf 'make depend ... ' 1>&2
+	    $MAKE depend >> make.log 2>&1
+	    RETVAL=$?
+	    if test "x$RETVAL" != x0 ; then
+		tail make.log
+		echo "makedependmodel: make depend failed" 1>&2
+		cp make.log $CDIR"/make.log"
+		return 1
+	    else
+		echo succesful 1>&2
+	    fi
+	)
+    fi
 }
 
 makemodel()
@@ -360,8 +376,8 @@
 {
     cat - << EOF
 $0 [-help] [-quick] [-verbose] dir1 [dir2] [...]
- -help      Show this help message
- -quick     Skip "genmake" and "make depend" if the Makefile exists
+
+ -help|-h      Show this help message
  -quiet     Reduce the amount of output
  -verbose   Produce copious amounts of output
  -debug     Produce even more output which will mean nothing to most
@@ -399,11 +415,16 @@
 clean=0
 expts=''
 # ieee=1
-# quick=0
+
+CLEANUP=f
+QUICK=f
+NOGENMAKE=f
+NOCLEAN=f
+NODEPEND=f
 
 BASH=
 OPTFILES=
-ADDRESSES=edhill@mitgcm.org
+ADDRESSES=
 TESTDIRS=
 MPACKDIR="../tools/mpack-1.6"
 MPACK="$MPACKDIR/mpack"
@@ -460,6 +481,18 @@
 	-make=* | --make=*)
 	    MAKE=$ac_optarg ;;
 
+	-clean | --clean)
+	    CLEANUP=t ;;
+
+	-quick | --quick | -q | --q)
+	    QUICK=t ;;
+	-nogenmake | --nogenmake | -ng | --ng)
+	    NOGENMAKE=t ;;
+	-noclean | --noclean | -nc | --nc)
+	    NOCLEAN=t ;;
+	-nodepend | --nodepend | -nd | --nd)
+	    NODEPEND=t ;;
+
 	-mpi) MPI=t ;;
 	-verbose) verbose=2 ;;
 	-debug) debug=1 ;;
@@ -480,10 +513,26 @@
      
 done
 
+if test "x$QUICK" = xt ; then
+    NOGENMAKE=t
+    NOCLEAN=t
+    NODEPEND=t
+fi
+
 if test "x$TESTDIRS" = x ; then
     TESTDIRS=`scandirs`
 fi
 
+if test "x$OPTFILES" = x ; then
+    OPTFILES=$MITGCM_OF
+fi
+if test "x$OPTFILES" = x ; then
+    echo "Error: please specify an optfile using either the command-line or"
+    echo "  the MITGCM_OF environment variable.  Also, examples are located "
+    echo "  in \$ROOTDIR/tools/build_options"
+    exit 1
+fi
+
 echo "OK"
 
 #  create the FORTRAN comparison code
@@ -537,48 +586,33 @@
     #  ...and each test directory...
     for dir in $TESTDIRS ; do
 
+	#  Cleanup only!
+	if test "x$CLEANUP" = xt ; then
+	    if test -r $dir/build/Makefile ; then
+		( cd $dir/build ; make CLEAN )
+	    fi
+	    if test -r $dir/input/Makefile ; then
+		( cd $dir/input ; make CLEAN )
+	    fi
+	    continue
+	fi
+
 	#  Verify that the testdir exists and contains previous 
 	#  results in the correct location--or skip this directory!
 	if test ! -r $dir"/results/output.txt" ; then
-	    echo | tee -a $SUMMARY
-	    echo "can't read \"$dir/results/output.txt\" -- skipping $dir" \
-		| tee -a $SUMMARY
+	    echo
+	    echo "can't read \"$dir/results/output.txt\" -- skipping $dir"
+	    echo
 	    continue
 	fi
 
-	#  Is this an MPI run?
-	if test "x$MPI" = xt ; then
-	    if test ! -r $dir"/code/CPP_EEOPTIONS.h_mpi" -o ! -r $dir"/code/SIZE.h_mpi" ; then
-		echo | tee -a $SUMMARY
-		echo "can't read \"$dir/code/CPP_EEOPTIONS.h_mpi\" or \"$dir/code/SIZE.h_mpi\"" \
-		    | tee -a $SUMMARY
-		continue
-	    else
-		cp $dir"/code/CPP_EEOPTIONS.h_mpi" $dir"/code/CPP_EEOPTIONS.h"
-		cp $dir"/code/SIZE.h_mpi" $dir"/code/SIZE.h"
-	    fi
-	else
-	    if test -r $dir"/code/CPP_EEOPTIONS.h_nompi" ; then
-		cp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h"
-	    fi
-            if test -r $dir"/code/SIZE.h_nompi" ; then
-                cp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h"
-            fi
-	fi
-
-	#  Create an output dir for each OPTFILE/tdir combination
-	CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR
-	mkdir $CDIR
-	CDIR=`pwd`"/$CDIR"
-
-	#  ...configue, make, run, and compare the output.
 	echo "-------------------------------------------------------------------------------"
 	echo
 	echo "Experiment:  $dir"
 	echo
 	unset genmake makedepend make run
 	results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
-	( cd $dir/input; rm -f *.{o,f,c,F} *.[f,F]90 work* output.txt Make* make.log; )
+
 	if [ -r $dir/build ]; then
 	    seperatebuilddir=1
 	    builddir=build
@@ -590,13 +624,59 @@
 	    rundir=input
 	fi
 
-	genmakemodel $dir/$builddir && genmake=Y \
-	    && makeclean $dir/$builddir \
-	    && makedependmodel $dir/$builddir && makedepend=Y \
-	    && makemodel $dir/$builddir && make=Y \
-	    && linkdata $seperatebuilddir $dir/$rundir \
-	    && runmodel $dir/$builddir && run=Y \
-	    && results=`testoutput $dir $rundir`
+	CODE_DIR=$dir/code
+	BUILD_DIR=$dir/$builddir
+	MPI_FILES="CPP_EEOPTIONS.h_mpi SIZE.h_mpi"
+	NOMPI_FILES="CPP_EEOPTIONS.h_nompi SIZE.h_nompi"
+	#  Is this an MPI run?
+	if test "x$MPI" = xt ; then
+	    FILES=$MPI_FILES
+	else
+	    FILES=$NOMPI_FILES
+	fi
+
+	#  Check to see that we have the files
+	have_files=t
+	for i in $FILES ; do
+	    if test ! -r $CODE_DIR/$i ; then
+		echo "Warning: can't read file $CODE_DIR/$i" | tee -a $SUMMARY
+		have_files=f
+	    fi
+	done
+	if test "x$have_files" != xt -a "x$MPI" = xt ; then
+	    echo "Skipping $dir due to lack of input files (see above warning)" \
+		| tee -a $SUMMARY
+	    continue
+	fi
+
+	#  If we have the $FILES and they differ, copy the $FILES to $BUILD_DIR
+	if "x$have_files" = xt ; then
+	    for i in $FILES ; do
+		cmp $CODE_DIR/$i $BUILD_DIR/$i > /dev/null 2>&1
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		    cp $CODE_DIR/$i $BUILD_DIR/$i
+		fi
+	    done
+	fi
+
+	#  Create an output dir for each OPTFILE/tdir combination
+	CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR
+	mkdir $CDIR
+	CDIR=`pwd`"/$CDIR"
+
+	if test "x$CLEANUP" = xt ; then
+	    makeclean $dir/$builddir
+	else
+	    genmakemodel $dir/$builddir && genmake=Y \
+		&& makeclean $dir/$builddir \
+		&& makedependmodel $dir/$builddir && makedepend=Y \
+		&& makemodel $dir/$builddir && make=Y \
+		&& linkdata $seperatebuilddir $dir/$rundir \
+		&& runmodel $dir/$builddir && run=Y \
+		&& results=`testoutput $dir $rundir`
+	fi
+
 	echo
 	formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
 	    ${run:-N} $results
@@ -618,12 +698,16 @@
 	    gzip $NDIR".tar"
 	)
 
-	$MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES
-	RETVAL=$?
-	if test "x$RETVAL" != x0 ; then
-	    echo "Warning: \"$MPACK\" failed -- please contact <edhill@mitgcm.org>"
+	if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
+	    echo "No mail sent"
 	else
-	    rm -f $DRESULTS"/"$NDIR".tar*"
+	    $MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES
+	    RETVAL=$?
+	    if test "x$RETVAL" != x0 ; then
+		echo "Warning: \"$MPACK\" failed -- please contact <edhill@mitgcm.org>"
+	    else
+		rm -f $DRESULTS"/"$NDIR".tar*"
+	    fi
 	fi
 
 	NDIR=$(( $NDIR + 1 ))