--- MITgcm/verification/testreport	2011/04/30 22:20:17	1.161
+++ MITgcm/verification/testreport	2012/03/14 02:34:20	1.171
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.161 2011/04/30 22:20:17 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.171 2012/03/14 02:34:20 jmc Exp $
 #  $Name:  $
 #
 
@@ -15,8 +15,9 @@
     echo "  (-mpi)                   use MPI to compile and run on 2 processors"
     echo "  (-MPI)  NUMBER           use MPI to compile and run on max NUMBER procs"
     echo "  (-mfile|-mf) STRING      MPI: file with list of possible machines to run on"
-    echo "  (-ieee/-noieee)          if possible, use IEEE compiler flags"
-    echo "                             (DEF=\"-ieee\")"
+    echo "  (-fast)                  use optfile default for compiler flags (no '-ieee')"
+    echo "                            DEF=off => use IEEE numerics option (if available)"
+    echo "  (-devel)                 use optfile developement flags (if available)"
     echo "  (-gsl)                   compile with \"-gsl\" flag"
     echo "  (-use_r4|-ur4)           if allowed, use real*4 type for '_RS' variable"
     echo "  (-optfile|-of) STRING    list of optfiles to use"
@@ -47,8 +48,10 @@
     echo "  (-match) NUMBER          Matching Criteria (number of digits)"
     echo "                             (DEF=\"$MATCH_CRIT\")"
     echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
+    echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"
     echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"
     echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
+    echo "  (-obj)                   only produces objects (=norun & no executable)"
     echo "  (-runonly|-ro)           *ONLY* run stage (=\"-quick\" without make)"
     echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
     echo "  (-nogenmake|-ng)         skip the genmake stage"
@@ -248,8 +251,9 @@
 		  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  ref_cost_function" "ADM CostFct" $2 $3; yy=$? ;;
+ 	 'AdGrd') testoutput_var $1 "ADM  adjoint_gradient"  "ADM Ad Grad" $2 $3; yy=$? ;;
+ 	 'FDGrd') testoutput_var $1 "ADM  finite-diff_grad"  "ADM FD 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=$? ;;
@@ -286,6 +290,14 @@
 	 'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Heff max"	  $2 $3; yy=$? ;;
 	 'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Heff mean"  $2 $3; yy=$? ;;
 	 'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Heff StDv"  $2 $3; yy=$? ;;
+	 'uSImn') testoutput_var $1 "seaice_uice_min"   "SIce Uice min"	  $2 $3; yy=$? ;;
+	 'uSImx') testoutput_var $1 "seaice_uice_max"   "SIce Uice max"	  $2 $3; yy=$? ;;
+	 'uSIav') testoutput_var $1 "seaice_uice_mean"  "SIce Uice mean"  $2 $3; yy=$? ;;
+	 'uSIsd') testoutput_var $1 "seaice_uice_sd"    "SIce Uice StDv"  $2 $3; yy=$? ;;
+	 'vSImn') testoutput_var $1 "seaice_vice_min"   "SIce Vice min"	  $2 $3; yy=$? ;;
+	 'vSImx') testoutput_var $1 "seaice_vice_max"   "SIce Vice max"	  $2 $3; yy=$? ;;
+	 'vSIav') testoutput_var $1 "seaice_vice_mean"  "SIce Vice mean"  $2 $3; yy=$? ;;
+	 'vSIsd') testoutput_var $1 "seaice_vice_sd"    "SIce Vice 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=$? ;;
@@ -338,8 +350,11 @@
 	    if test "x$OPTFILE" != xNONE ; then
 		command="$command -optfile=$OPTFILE"
 	    fi
-	    if test "x$IEEE" != x ; then
-		command="$command -ieee"
+	    if test $OptLev = 1 ; then
+ 		command="$command -ieee"
+ 	    fi
+	    if test $OptLev = 0 ; then
+		command="$command -devel"
 	    fi
 	    if test "x$GSL" = xt ; then
 		command="$command -gsl"
@@ -354,6 +369,9 @@
 	    if test "x$USE_R4" = xt ; then
 		command="$command -use_r4"
 	    fi
+	    if test "x$EXTRFLG" != x ; then
+		command="$command -extra_flag $EXTRFLG"
+	    fi
 	    if test "x$TS" = xt ; then
 		command="$command -ts"
 	    fi
@@ -474,22 +492,17 @@
 	cd $1;
 	if test -r Makefile ; then
 	    printf 'make ... '
-	    if test "x$ADM" = xt ; then
-		$MAKE adall >> make.tr_log 2>&1
-	    elif test "x$OADM" = xt ; then
-		$MAKE adAll >> make.tr_log 2>&1
-            else
-		if test "x$JOBS" = x ; then
-		    $MAKE >> make.tr_log 2>&1
-		else
-		    $MAKE -j $JOBS >> make.tr_log 2>&1
-		fi
+	    if test "x$REPLMAKE" = x ; then
+		$MAKE $TARG >> make.tr_log 2>&1
+	    else
+		$REPLMAKE $TARG >> make.tr_log 2>&1
 	    fi
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
 		tail make.tr_log
 		echo failed
-		cp make.tr_log genmake.log genmake.tr_log $CDIR
+		cp genmake.log genmake.tr_log $CDIR
+		tail -$NBLINES_MKLOG make.tr_log > $CDIR"/make.tr_log_tail"
 		rm -f $EXECUTABLE
 		mk_fail=1
 	    else
@@ -726,7 +739,7 @@
 	else
           if test ! -f $OUTPUTFILE -o $OUTPUTFILE -ot $EXECUTABLE ; then
             # output do not exist or is older than executable:
-	    rm -f $RUNLOG ; touch $RUNLOG
+	    rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG
 	    if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
 	    ( eval $COMMAND ) >> $RUNLOG 2>&1
 	    RETVAL=$?
@@ -915,11 +928,9 @@
 #  Default properties
 debug=0
 verbose=1
+NBLINES_MKLOG=16000
 
-IEEE=true
-if test "x$MITGCM_IEEE" != x ; then
-    IEEE=$MITGCM_IEEE
-fi
+OptLev=1
 GSL=f
 
 CLEANUP=f
@@ -944,16 +955,19 @@
 if test "x$MAKE" = x ; then
     MAKE=make
 fi
+REPLMAKE=
 if test "x$CC" = x ; then
     CC=cc
 fi
 JOBS=
+TARG=
 MPI=0
 MPI_MFILE=
 MULTI_THREAD=f
 OUTDIR=
 DELDIR=
 USE_R4=
+EXTRFLG=
 
 ADM=
 OADM=
@@ -1006,6 +1020,9 @@
 	-make | --make | -m | --m) ac_prev=MAKE ;;
 	-make=* | --make=* | -m=* | --m=*) MAKE=$ac_optarg ;;
 
+	-repl_mk | --repl_mk ) ac_prev=REPLMAKE ;;
+	-repl_mk=* | --repl_mk=*) REPLMAKE=$ac_optarg ;;
+
 	-odir | --odir) ac_prev=OUTDIR ;;
 	-odir=* | --odir=*) OUTDIR=$ac_optarg ;;
 
@@ -1018,9 +1035,13 @@
 	-j | --j) ac_prev=JOBS ;;
 	-j=* | --j=*) JOBS=$ac_optarg ;;
 
+	-ef | --ef) ac_prev=EXTRFLG ;;
+	-ef=* | --ef=*) EXTRFLG=$ac_optarg ;;
+
 	-clean | --clean) CLEANUP=t ; DELDIR=t ;;
 
 	-norun | --norun | -nr | --nr) NORUN=t ;;
+	-obj | --obj ) TARG='obj' ; NORUN=t ;;
 	-runonly | --runonly | -ro | --ro) QUICK=t ; NOMAKE=t ;;
 	-quick | --quick | -q | --q) QUICK=t ;;
 	-nogenmake | --nogenmake | -ng | --ng) NOGENMAKE=t ;;
@@ -1042,8 +1063,12 @@
 	-adm | -ad) ADM=t ;;
 	-oad) OADM=t; NODEPEND=t ;;
 
-	-ieee) IEEE=true ;;
-	-noieee) IEEE= ;;
+	-ieee)   echo "Warning: ignore option '-ieee' (already the default)"
+                 printf " ... " ;;
+	-noieee) echo "Warning: will use option '-fast' instead of '-noieee' (obsolete)"
+                 printf " ... " ; OptLev=`expr $OptLev \* 2` ;;
+	-fast)  OptLev=`expr $OptLev \* 2` ;;
+	-devel) OptLev=0 ;;
 	-gsl) GSL=t ;;
 
 	-verbose) verbose=2 ;;
@@ -1092,16 +1117,19 @@
 
 #- setting for forward or ADM testing
 if test "x$ADM" = xt ; then
+    if test "x$TARG" = xobj ; then TARG=adobj ; else TARG=adall ; fi
     code_dir=code_ad
     inputdir=input_ad
     ref_outp="output_adm.txt"
     EXECUTABLE="mitgcmuv_ad"
 elif test "x$OADM" = xt ; then
+    TARG=adAll
     code_dir=code_oad
     inputdir=input_oad
     ref_outp="output_oadm.txt"
     EXECUTABLE="mitgcmuv_ad"
 else
+    if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi
     code_dir=code
     inputdir=input
     ref_outp="output.txt"
@@ -1180,8 +1208,8 @@
     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='Grad Cost Grad'
-    EMPTY_RESULTS='.. ..'
+    DEF_CHECK_LIST='AdGrd Cost AdGrd FDGrd'
+    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
 
@@ -1267,8 +1295,8 @@
     else line_0="default "$MATCH_CRIT ; fi
        line_0="$line_0  ----T-----  ----S-----  ----U-----  ----V-----"
     line_1="G D M    c        m  s        m  s        m  s        m  s"
-    line_2="E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  ."
-    line_3="N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d"
+    line_2="e p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  ."
+    line_3="n n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d"
     line_4="2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  ."
     for ii in $PTRACERS_NUM ; do
 	line_0="$line_0  --PTR 0"$ii"--"
@@ -1291,10 +1319,10 @@
     else line_0="default    "$MATCH_CRIT ; fi
     echo "$line_0" | tee -a $SUMMARY
     cat << EOF | tee -a $SUMMARY
-G D M    C  G
-E p a R  o  r
-N n k u  s  a
-2 d e n  t  d
+G D M    C  A  F
+e p a R  o  d  D
+n n k u  s  G  G
+2 d e n  t  r  r
 
 EOF
 fi
@@ -1524,8 +1552,9 @@
 	    if test "x$RETVAL" = x0 ; then
 		echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state
 		sed -n '/Get compiler version/,/<-- compiler version/p' $gmkLog \
-		       | grep -v '^... compiler version ' > tr_1.tmp_log
-		sed -n '1,/^$/p' tr_1.tmp_log | sed '/^$/d' | sed 's/^./ &/' \
+			| grep -v '^... compiler version ' > tr_1.tmp_log
+		sed -n '1p' tr_1.tmp_log >> $DRESULTS/genmake_state
+		sed -n '2,/^$/p' tr_1.tmp_log | sed '/^$/d' | sed 's/^./ &/' \
 			>> $DRESULTS/genmake_state
 		rm -f tr_1.tmp_log
 	    fi