--- MITgcm/verification/testreport	2007/09/17 15:35:46	1.100
+++ MITgcm/verification/testreport	2007/10/29 19:14:12	1.107
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.100 2007/09/17 15:35:46 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.107 2007/10/29 19:14:12 jmc Exp $
 #  $Name:  $
 #
 
@@ -189,22 +189,6 @@
     done
 }
 
-testoutput_ad()
-{
-    grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt
-    grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $5}' > t15.txt
-    grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt
-    grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $6}' > t16.txt
-    join t05.txt t15.txt > t5.txt
-    join t06.txt t16.txt > t6.txt
-    echo "-1" >> t5.txt
-    echo "-1" >> t6.txt
-    digits_5=`./tr_cmpnum < t5.txt`
-    digits_6=`./tr_cmpnum < t6.txt`
-    dashnum $digits_5 $digits_6
-    rm -f t[01][56].txt t[56].txt
-}
-
 check_for_add_mon_output()
 {
     # Check for additional types of monitor output
@@ -235,7 +219,7 @@
     # testoutput_run directory subdir reference_output
     #
     #  test output from 1 run in "directory"
-#   if test "x$ADM" = x ; then
+# --> same processing for adjoint & forward test
         # default list of output variables to be checked:
         #  1rst : main variable used to decide if it pass or FAIL
         #  others : number of matching digits to be printed in summary.txt
@@ -270,8 +254,8 @@
 		  then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi
 		  testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $3; yy=$?
 		  if [ $debug -gt 0 ] ; then echo testoutput_run: cg2dres=$yy 1>&2 ; fi ;;
- 	   'Cost') testoutput_var $1 "ADM  precision_derivative_cost" "ADM Cost" $2 $3; yy=$? ;;
- 	   'Grad') testoutput_var $1 "ADM  precision_derivative_grad" "ADM Grad" $2 $3; yy=$? ;;
+ 	  'Cost') testoutput_var $1 "ADM  precision_derivative_cost" "ADM Cost" $2 $3; yy=$? ;;
+ 	  'Grad') testoutput_var $1 "ADM  precision_derivative_grad" "ADM Grad" $2 $3; yy=$? ;;
  	   'Tmn') testoutput_var $1 "dynstat_theta_min"  "Theta minimum"  $2 $3; yy=$? ;;
  	   'Tmx') testoutput_var $1 "dynstat_theta_max"  "Theta maximum"  $2 $3; yy=$? ;;
  	   'Tav') testoutput_var $1 "dynstat_theta_mean" "Theta mean"	  $2 $3; yy=$? ;;
@@ -296,6 +280,24 @@
 	   testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $3; yy=$? ;;
 	'pt1sd'|'pt2sd'|'pt3sd'|'pt4sd'|'pt5sd') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
 	   testoutput_var $1 "trcstat_ptracer0"$ii"_sd"   "p0"$ii"_StDv"  $2 $3; yy=$? ;;
+	 'Qntmn') testoutput_var $1 "extforcing_qnet_min" "Qnet minimum"  $2 $3; yy=$? ;;
+	 'Qntmx') testoutput_var $1 "extforcing_qnet_max" "Qnet maximum"  $2 $3; yy=$? ;;
+	 'Qntav') testoutput_var $1 "extforcing_qnet_mean" "Qnet mean"	  $2 $3; yy=$? ;;
+	 'Qntsd') testoutput_var $1 "extforcing_qnet_sd"  "Qnet Std.Dev"  $2 $3; yy=$? ;;
+	 'aSImn') testoutput_var $1 "seaice_area_min"   "SIce Area min"	  $2 $3; yy=$? ;;
+	 'aSImx') testoutput_var $1 "seaice_area_max"   "SIce Area max"	  $2 $3; yy=$? ;;
+	 'aSIav') testoutput_var $1 "seaice_area_mean"  "SIce Area mean"  $2 $3; yy=$? ;;
+	 'aSIsd') testoutput_var $1 "seaice_area_sd"    "SIce Area StDv"  $2 $3; yy=$? ;;
+	 'hSImn') testoutput_var $1 "seaice_heff_min"   "SIce Heff min"	  $2 $3; yy=$? ;;
+	 'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Hell max"	  $2 $3; yy=$? ;;
+	 'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Hell mean"  $2 $3; yy=$? ;;
+	 'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Hell StDv"  $2 $3; yy=$? ;;
+	'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;;
+	'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $3; yy=$? ;;
+	'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $3; yy=$? ;;
+	'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Global"	  $2 $3; yy=$? ;;
+	'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South"	  $2 $3; yy=$? ;;
+	'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North"	  $2 $3; yy=$? ;;
               *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
           esac
           if test $xx = $sVar
@@ -312,10 +314,7 @@
         else
 	  echo $allargs
         fi 
-
-#   else
-#	testoutput_ad $1 $2 "precision_grdchk_result"
-#   fi
+# <-- same processing for adjoint & forward test
 }
 
 genmakemodel()
@@ -415,6 +414,7 @@
 	    find . -type l -exec rm {} \;
 	    rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime
 	    rm -rf mnc_test_*
+ 	    rm -f *_MIT_CE_000.opt0000 costfunction*0000
 	    echo successful 1>&2
 	    exit 0
 	)
@@ -576,6 +576,10 @@
 	printf 'runmodel in %s ...' $1 1>&2
 	# make output.txt
 	echo
+	if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
+	    diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
+	    outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi
+	fi
         if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
 	    echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
 	    ln -sf "../"$builddir"/"$EXECUTABLE .
@@ -911,11 +915,7 @@
 fi
 
 if test "x$TESTDIRS" = x ; then
-#   if test "x$ADM" = xt ; then
-#	LIST=`scandirs results_ad/$ref_outp`
-#   else
-	LIST=`scandirs results/$ref_outp`
-#   fi
+    LIST=`scandirs results/$ref_outp`
 else
     #- expand group of experiments:
     LIST=" "
@@ -967,7 +967,6 @@
     OUTPUTFILE="STDOUT.0000"
 fi
 
-#echo "OK"
 echo "OK (COMMAND= $COMMAND )"
 
 # set the Default List of output variables to be checked:
@@ -981,7 +980,7 @@
     ii=`echo $EMPTY_RESULTS | awk '{print NF}'`
     EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`
 else
-    DEF_CHECK_LIST='Cost Cost Grad'
+    DEF_CHECK_LIST='Grad Cost Grad'
     EMPTY_RESULTS='.. ..'
     LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
 fi
@@ -1078,8 +1077,8 @@
     echo "ADJOINT=true" >> $SUMMARY
     echo >> $SUMMARY
     if [ $MATCH_CRIT -lt 10 ] ; 
-    then line_0="default  "$MATCH_CRIT ; 
-    else line_0="default "$MATCH_CRIT ; fi
+    then line_0="default     "$MATCH_CRIT ; 
+    else line_0="default    "$MATCH_CRIT ; fi
     echo "$line_0" | tee -a $SUMMARY
     cat << EOF | tee -a $SUMMARY
 G D M    C  G
@@ -1093,15 +1092,25 @@
 #  ...and each test directory...
 for dir in $TESTDIRS ; do
     
+    # set builddir & rundir:
+    builddir="build"
+    if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
+    rundir="run"
+    if test ! -d $dir/$rundir ; then
+	rundir=$builddir
+    fi
+    CODE_DIR=$dir/$code_dir
+    BUILD_DIR=$dir/$builddir
+
     #  Cleanup only!
     if test "x$CLEANUP" = xt ; then
-	if test -r $dir/build/Makefile ; then
+	if test -r $BUILD_DIR/Makefile ; then
             echo '  ------  clean dir:' $dir/build
-	    ( cd $dir/build ; make CLEAN )
+	    ( cd $BUILD_DIR ; make CLEAN )
 	fi
-	if test -d $dir/run/CVS ; then
-            echo '  ------  clean dir:' $dir/run
-	    run_clean $dir/run
+	if test -d $dir/$rundir/CVS ; then
+            echo '  ------  clean dir:' $dir/$rundir
+	    run_clean $dir/$rundir
 	fi
 	(
 	    cd $dir
@@ -1112,12 +1121,7 @@
 
     #  Verify that the testdir exists and contains previous 
     #  results in the correct location--or skip this directory!
-    fout=
-    if test "x$ADM" = x ; then
-	fout=$dir"/results/"$ref_outp
-    else
-	fout=$dir"/results_ad/"$ref_outp
-    fi
+    fout=$dir"/results/"$ref_outp
     if test ! -r $fout ; then
 	echo "can't read \"$fout\" -- skipping $dir"
 	continue
@@ -1128,15 +1132,6 @@
 
     # Check for additional types of monitor output
 
-    builddir="build"
-    if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
-    rundir="run"
-    if test ! -d $dir/$rundir ; then
-	rundir=$builddir
-    fi
-    CODE_DIR=$dir/$code_dir
-    BUILD_DIR=$dir/$builddir
-
     if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then
 	echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
 	continue
@@ -1200,7 +1195,7 @@
     fi
     
     echo
-#   if test "x$ADM" = x ; then
+# --> same processing for adjoint & forward test
 	fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
 	echo
  	echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
@@ -1214,15 +1209,17 @@
 	for ex in $extra_runs ; do
 	    unset run
             results=$EMPTY_RESULTS
+	    #  reference output file
+	    refExOut=`echo $ref_outp | sed "s/\./.${ex}./g"`
 	    #  Create an output dir for each OPTFILE/tdir.ex combination
 	    rel_CDIR=$DRESULTS"/"$dir"."$ex
 	    mkdir $rel_CDIR
 	    CDIR=`pwd`"/$rel_CDIR"
 	    test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
- 	    run_clean $dir/tr_run.$ex
-            linkdata $dir/tr_run.$ex input.$ex input
+	    run_clean $dir/tr_run.$ex
+	    linkdata $dir/tr_run.$ex input.$ex input
 	    runmodel $dir/tr_run.$ex && run=Y \
-		&& results=`testoutput_run $dir tr_run.$ex "output.${ex}.txt"`
+	    && results=`testoutput_run $dir tr_run.$ex $refExOut`
 	    fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
 	    fres="$fres.$ex"
 	    echo
@@ -1237,19 +1234,9 @@
 		run_clean $dir/tr_run.$ex
 	    fi
 	done
-#   else
-#	fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
-#	fres=$fres"$results   $dir"
-#	echo
-#	echo "$fres" >> $SUMMARY
-#	touch $CDIR"/summary.txt"
-#	echo "fresults='$fres'" >> $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"
-#   fi
+# <-- same processing for adjoint & forward test
     if test "x$ADM" = xt ; then
+	head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt"
 	grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
 			   >> $CDIR"/summary.txt"
     fi
@@ -1299,11 +1286,11 @@
 rm -f tr_cmpnum.c tr_cmpnum
 
 if test "x$CLEANUP" != xt ; then
-    cat $SUMMARY | sed 's/  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.//'
+    cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'
     if test -e tr_out.txt ; then
         mv tr_out.txt tr_out.txt.old
     fi
-    cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/  \.//g' > tr_out.txt
+    cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/ \. //g' > tr_out.txt
 fi
 
 if test "x$DELDIR" = xt ; then