--- MITgcm/verification/testreport	2003/10/03 18:55:29	1.9.2.6
+++ MITgcm/verification/testreport	2003/11/11 16:05:11	1.16
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.9.2.6 2003/10/03 18:55:29 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.16 2003/11/11 16:05:11 edhill Exp $
+#  $Name:  $
 #
 
 usage()
@@ -11,6 +12,7 @@
     echo "where possible OPTIONS are:"
     echo "  (-help|-h)               print usage"
     echo "  (-mpi)                   use MPI input files"
+    echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
     echo "  (-optfile=|-of=)STRING   list of optfiles to use"
     echo "  (-a|-addr)STRING         list of email recipients"
     echo "                             (DEF=\"edhill@mitgcm.org\")"
@@ -18,10 +20,11 @@
     echo "                             (DEF=\"\" which builds all)"
     echo "  (-b|-bash)STRING         location of \"bash\" executable"
     echo "                             (DEF=\"\" for \"/bin/bash\")"
-    echo "  (-c|-command)STRING      command to run"
+    echo "  (-command)STRING         command to run"
     echo "                             (DEF=\"make output.txt\")"
     echo "  (-m|-make)STRING         command to use for \"make\""
     echo "                             (DEF=\"make\")"
+    echo "  (-clean)                 *ONLY* run \"make CLEAN\""
     echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
     echo "  (-nogenmake|-ng)         skip the genmake stage"
     echo "  (-noclean|-nc)           skip the \"make clean\" stage"
@@ -78,7 +81,7 @@
 	echo testoutput_for_prop: grep "$2" $1/$4/output.txt 1>&2
     fi
     if [ -r $1/$4/output.txt ]; then
-	grep "$2" $1/$4/output.txt | sed 's/.*=//' | nl > tmp1.txt
+	grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
 	lncnt=`wc -l tmp1.txt | awk '{print $1}' `
 	if [ $lncnt -lt 3 ]; then
 	    if [ $verbose -gt 0 ]; then
@@ -93,7 +96,7 @@
     if [ $debug -gt 0 ]; then
 	echo testoutput_for_prop: grep "$2" $1/results/output.txt 1>&2
     fi
-    grep "$2" $1/results/output.txt | sed 's/.*=//' | nl > tmp2.txt
+    grep "$2" $1/results/output.txt | sed 's/.*=//' | cat -n > tmp2.txt
     lncnt=`wc -l tmp2.txt | awk '{print $1}' `
     if [ $lncnt -lt 3 ]; then
 	if [ $verbose -gt 0 ]; then
@@ -153,7 +156,6 @@
     if [ $debug -gt 0 ]; then
 	echo testoutput: cg2dres=$cg2dres 1>&2
     fi
-    
     testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?
     testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?
     testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?
@@ -184,15 +186,19 @@
 	GENMAKE2="$BASH ../../../tools/genmake2"
 	(
 	    cd $1;
-	    printf 'genmake ... ' 1>&2
 	    command="$GENMAKE2  -ds -m $MAKE --mods=../code"
 	    if test "x$OPTFILE" != xNONE ; then
 		command="$command --optfile=$OPTFILE"
 		# echo "  command=\"$command\""
 	    fi
+	    if test "x$IEEE" != x ; then
+		command="$command -ieee"
+	    fi
+	    # echo "command: \"$command\""
+	    printf 'genmake ... ' 1>&2
 	    $command > make.log 2>&1
 	    RETVAL=$?
-	    for i in gm_state gm_optfile gm_local Makefile ; do
+	    for i in genmake_state genmake_optfile genmake_local Makefile ; do
 		if test -r $i ; then
 		    cp $i $CDIR
 		fi
@@ -286,8 +292,16 @@
     # linkdata flag
     #
     # symbolically link data files to run directory
-    if [ $1 -ne 0 ]; then
-	( cd $2 ;  ln -sf ../input/* . )
+    if test "x$1" = x1 ; then
+	(
+	    cd $2
+	    files=`( cd ../input ; ls -1 | grep -v CVS )`
+	    for i in $files ; do
+		if test ! -d "../input/"$i ; then
+		    ln -sf "../input/"$i $i
+		fi
+	    done
+	)
     fi
 }
 
@@ -387,7 +401,6 @@
  -debug     Produce even more output which will mean nothing to most
  -force     Do "make CLEAN" before compiling. This forces a complete rebuild.
  -clean     Do "make CLEAN" after compiling and testing.
- -noieee    By default, $0 uses the -ieee option for genmake. This turns it off.
  -cleanup   Aggresively removes all model output, executables and object files
             and then exits. Use with care.
 
@@ -420,6 +433,12 @@
 expts=''
 # ieee=1
 
+IEEE=
+if test "x$MITGCM_IEEE" != x ; then
+    IEEE=$MITGCM_IEEE
+fi
+
+
 CLEANUP=f
 QUICK=f
 NOGENMAKE=f
@@ -497,10 +516,13 @@
 	-nodepend | --nodepend | -nd | --nd)
 	    NODEPEND=t ;;
 
-	-mpi) MPI=t ;;
+	-mpi) MPI=true ;;
+
+	-ieee) IEEE=true ;;
+	-noieee) IEEE= ;;
+
 	-verbose) verbose=2 ;;
 	-debug) debug=1 ;;
-	-clean) clean=1 ;;
 	-quiet) verbose=0 ;;
 
         -*)
@@ -557,7 +579,9 @@
     exit 1
 fi
 SUMMARY="$DRESULTS/summary.txt"
+echo -n "Start time:  " >> $SUMMARY
 date > $SUMMARY
+start_date=`date`
 cat << EOF >> $SUMMARY
                 T           S           U           V
 G D M    c        m  s        m  s        m  s        m  s
@@ -569,9 +593,21 @@
 
 NDIR=0
 
+of_path=
 if test "x$OPTFILE" != xNONE ; then
     if test -r $OPTFILE ; then
-	OPTFILE=`pwd`"/$OPTFILE"
+	# get the path
+	path=${OPTFILE%/*}
+	if test "x$path" = x ; then
+	    of_path=`pwd`
+	else
+	    of_path=`( cd $path > /dev/null 2>&1 ; pwd )`
+	fi
+	file=${OPTFILE##*/}
+	OPTFILE=$of_path/$file
+    else
+	echo
+	echo "WARNING: can't read OPTFILE=\"$OPTFILE\" but will try to use it..."
     fi
 fi
 echo
@@ -595,9 +631,7 @@
     #  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
 	echo "can't read \"$dir/results/output.txt\" -- skipping $dir"
-	echo
 	continue
     fi
 
@@ -608,15 +642,14 @@
     unset genmake makedepend make run
     results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
 
-    if [ -r $dir/build ]; then
-	seperatebuilddir=1
-	builddir=build
-	rundir=build
-	( cd $dir/build; ln -sf ../input/* . )
-    else
-	seperatebuilddir=0
-	builddir=input
-	rundir=input
+    builddir="input"
+    rundir="input"
+    use_seperate_build=0
+    if test -d $dir/build -a -r $dir/build ; then
+	builddir="build"
+	rundir="build"
+	use_seperate_build=1
+	linkdata $use_seperate_build $dir/$rundir
     fi
     
     CODE_DIR=$dir/code
@@ -627,8 +660,10 @@
     #  Is this an MPI run?
     if test "x$MPI" = xt ; then
 	FILES=$MPI_FILES
+	endings="_mpi"
     else
 	FILES=$NOMPI_FILES
+	endings="_nompi"
     fi
     
     #  Check to see that we have the files
@@ -647,10 +682,12 @@
     #  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
+	    sstr="s|$endings||"
+	    name=`echo $i | sed -e $sstr `
+	    cmp $CODE_DIR/$i $BUILD_DIR/$name > /dev/null 2>&1
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
-		cp $CODE_DIR/$i $BUILD_DIR/$i
+		cp $CODE_DIR/$i $BUILD_DIR/$name
 	    fi
 	done
     fi
@@ -667,8 +704,8 @@
 	    && makeclean $dir/$builddir \
 	    && makedependmodel $dir/$builddir && makedepend=Y \
 	    && makemodel $dir/$builddir && make=Y \
-	    && linkdata $seperatebuilddir $dir/$rundir \
-	    && runmodel $dir/$builddir && run=Y \
+	    && linkdata $use_seperate_build $dir/$rundir \
+	    && runmodel $dir/$rundir && run=Y \
 	    && results=`testoutput $dir $rundir`
     fi
     
@@ -704,12 +741,25 @@
 	    rm -f $DRESULTS"/"$NDIR".tar*"
 	fi
     fi
+
+    echo "-------------------------------------------------------------------------------"
     
     NDIR=$(( $NDIR + 1 ))
     
 done
 
-rm tmp_cmpnum.f a.out
-
-cat $SUMMARY
+echo -n "Start time:  " >> $SUMMARY
+echo $start_date >> $SUMMARY
+echo -n "End time:    " >> $SUMMARY
+date >> $SUMMARY
+
+rm tmp_cmpnum.f a.out dfile
+
+if test "x$CLEANUP" != xt ; then
+    cat $SUMMARY
+    if test -e tr.out ; then
+        mv tr.out tr.out.old
+    fi
+    cat $SUMMARY > tr.out
+fi