--- MITgcm/verification/testreport	2003/10/03 02:18:21	1.9.2.1
+++ MITgcm/verification/testreport	2003/10/03 19:12:27	1.9.2.7
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.9.2.1 2003/10/03 02:18:21 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.9.2.7 2003/10/03 19:12:27 edhill Exp $
 #
 
 usage()
@@ -185,8 +185,12 @@
 	(
 	    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
+	    command="$GENMAKE2  -ds -m $MAKE --mods=../code"
+	    if test "x$OPTFILE" != xNONE ; then
+		command="$command --optfile=$OPTFILE"
+		# echo "  command=\"$command\""
+	    fi
+	    $command > make.log 2>&1
 	    RETVAL=$?
 	    for i in gm_state gm_optfile gm_local Makefile ; do
 		if test -r $i ; then
@@ -416,19 +420,19 @@
 expts=''
 # ieee=1
 
-QUICK=f
 CLEANUP=f
+QUICK=f
 NOGENMAKE=f
 NOCLEAN=f
 NODEPEND=f
 
 BASH=
-OPTFILES=
+OPTFILE=NONE
 ADDRESSES=
 TESTDIRS=
 MPACKDIR="../tools/mpack-1.6"
 MPACK="$MPACKDIR/mpack"
-COMMAND="rm -f output.txt; make output.txt"
+COMMAND="make output.txt"
 MAKE=make
 MPI=f
 
@@ -452,9 +456,9 @@
 	    usage ;;
 	
 	-optfile | --optfile | -of | --of)
-            ac_prev=OPTFILES ;;
+            ac_prev=OPTFILE ;;
         -optfile=* | --optfile=* | -of=* | --of=*)
-            OPTFILES=$ac_optarg ;;
+            OPTFILE=$ac_optarg ;;
 	
 	-addr | --addr | -a | --a)
             ac_prev=ADDRESSES ;;
@@ -481,6 +485,9 @@
 	-make=* | --make=*)
 	    MAKE=$ac_optarg ;;
 
+	-clean | --clean)
+	    CLEANUP=t ;;
+
 	-quick | --quick | -q | --q)
 	    QUICK=t ;;
 	-nogenmake | --nogenmake | -ng | --ng)
@@ -520,14 +527,8 @@
     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
+if test "x$OPTFILE" = xNONE -a "x$MITGCM_OF" != x ; then
+    OPTFILE=$MITGCM_OF
 fi
 
 echo "OK"
@@ -568,122 +569,146 @@
 
 NDIR=0
 
-#  For each optfile...
-for OPTFILE in $OPTFILES ; do
-
-    OPTFILE=`pwd`"/$OPTFILE"
-    if test ! -r $OPTFILE ; then
-	echo "Error: can't read optfile \"$OPTFILE\""
-	exit 1
+if test "x$OPTFILE" != xNONE ; then
+    if test -r $OPTFILE ; then
+	OPTFILE=`pwd`"/$OPTFILE"
     fi
-    echo
-    echo "OPTFILE=$OPTFILE" >> $SUMMARY
-    echo >> $SUMMARY
-    
-    #  ...and each test directory...
-    for dir in $TESTDIRS ; do
-
-	#  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
-	    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='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
+fi
+echo
+echo "OPTFILE=$OPTFILE" >> $SUMMARY
+echo >> $SUMMARY
 
-	if [ -r $dir/build ]; then
-	    seperatebuilddir=1
-	    builddir=build
-	    rundir=build
-	    ( cd $dir/build; ln -sf ../input/* . )
-	else
-	    seperatebuilddir=0
-	    builddir=input
-	    rundir=input
+#  ...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 "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`
+	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
-	formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
-	    ${run:-N} $results
+	echo "can't read \"$dir/results/output.txt\" -- skipping $dir"
 	echo
-	formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
-	    ${run:-N} $results >> $SUMMARY
-	echo "fresults='" > $CDIR"/summary.txt"
-	formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
-	    ${run:-N} $results >> $CDIR"/summary.txt"
-	echo "'" >> $CDIR"/summary.txt"
-	echo "MACH='$MACH'" >> $CDIR"/summary.txt"
-	echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
-	echo "DATE='$DATE'" >> $CDIR"/summary.txt"
-	echo "tdir='$dir'" >> $CDIR"/summary.txt"
+	continue
+    fi
 
-	(
-	    cd $DRESULTS
-	    tar -cf $NDIR".tar" $DRESULTS"_"$NDIR > /dev/null 2>&1
-	    gzip $NDIR".tar"
-	)
+    echo "-------------------------------------------------------------------------------"
+    echo
+    echo "Experiment:  $dir"
+    echo
+    unset genmake makedepend make run
+    results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
 
-	if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
-	    echo "No mail sent"
-	else
-	    $MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES
+    if [ -r $dir/build ]; then
+	seperatebuilddir=1
+	builddir=build
+	rundir=build
+	( cd $dir/build; ln -sf ../input/* . )
+    else
+	seperatebuilddir=0
+	builddir=input
+	rundir=input
+    fi
+    
+    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"
+	    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)"
+	continue
+    fi
+    
+    #  If we have the $FILES and they differ, copy the $FILES to $BUILD_DIR
+    if test "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
-		echo "Warning: \"$MPACK\" failed -- please contact <edhill@mitgcm.org>"
-	    else
-		rm -f $DRESULTS"/"$NDIR".tar*"
+		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
+    echo
+    formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
+	${run:-N} $results >> $SUMMARY
+    echo "fresults='" > $CDIR"/summary.txt"
+    formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
+	${run:-N} $results >> $CDIR"/summary.txt"
+    echo "'" >> $CDIR"/summary.txt"
+    echo "MACH='$MACH'" >> $CDIR"/summary.txt"
+    echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
+    echo "DATE='$DATE'" >> $CDIR"/summary.txt"
+    echo "tdir='$dir'" >> $CDIR"/summary.txt"
+    
+    (
+	cd $DRESULTS
+	tar -cf $NDIR".tar" $DRESULTS"_"$NDIR > /dev/null 2>&1
+	gzip $NDIR".tar"
+    )
+    
+    if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
+	echo "No mail sent"
+    else
+	$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 ))
-	
-    done
+    echo "-------------------------------------------------------------------------------"
+    
+    NDIR=$(( $NDIR + 1 ))
+    
 done
 
 rm tmp_cmpnum.f a.out