--- MITgcm/verification/testreport	2003/10/03 02:18:21	1.9.2.1
+++ MITgcm/verification/testreport	2003/10/03 04:04:38	1.9.2.2
@@ -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.2 2003/10/03 04:04:38 edhill Exp $
 #
 
 usage()
@@ -416,8 +416,8 @@
 expts=''
 # ieee=1
 
-QUICK=f
 CLEANUP=f
+QUICK=f
 NOGENMAKE=f
 NOCLEAN=f
 NODEPEND=f
@@ -428,7 +428,7 @@
 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
 
@@ -481,6 +481,9 @@
 	-make=* | --make=*)
 	    MAKE=$ac_optarg ;;
 
+	-clean | --clean | -c | --c)
+	    CLEANUP=t ;;
+
 	-quick | --quick | -q | --q)
 	    QUICK=t ;;
 	-nogenmake | --nogenmake | -ng | --ng)
@@ -583,6 +586,17 @@
     #  ...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
@@ -600,15 +614,31 @@
 		    | 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"
+		cmp $dir"/code/CPP_EEOPTIONS.h_mpi" $dir"/code/CPP_EEOPTIONS.h"
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		    cp $dir"/code/CPP_EEOPTIONS.h_mpi" $dir"/code/CPP_EEOPTIONS.h"
+		fi
+		cmp $dir"/code/SIZE.h_mpi" $dir"/code/SIZE.h"
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		    cp $dir"/code/SIZE.h_mpi" $dir"/code/SIZE.h"
+		fi
 	    fi
 	else
 	    if test -r $dir"/code/CPP_EEOPTIONS.h_nompi" ; then
-		cp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h"
+		cmp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h"
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		    cp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h"
+		fi
 	    fi
             if test -r $dir"/code/SIZE.h_nompi" ; then
-                cp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h"
+                cmp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h"
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		    cp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h"
+		fi
             fi
 	fi