--- MITgcm/verification/testreport	2011/01/27 04:51:03	1.157
+++ MITgcm/verification/testreport	2012/05/02 14:30:28	1.172
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.157 2011/01/27 04:51:03 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.172 2012/05/02 14:30:28 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"
@@ -238,12 +241,6 @@
           listVar=" $sVar "`echo "$listVar " | sed "s/ $sVar / /g"`
         fi
 	if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(M)='$listVar'" 1>&2 ; fi
-	#- report to this experiment local summary file ---
-	echo "MACH='$MACH'" > $locDIR"/summary.txt"
-	echo "UNAMEA='$UNAMEA'" >> $locDIR"/summary.txt"
-	echo "DATE='$DATE'" >> $locDIR"/summary.txt"
-	grep '(PID\.TID 0000\.0001)      n.. =' $1/$2/$OUTPUTFILE \
-         | sed 's/(PID.TID 0000.0001)     //' >> $locDIR"/summary.txt"
 	echo "listVar='$listVar'" >> $locDIR"/summary.txt"
         #---
         allargs=""
@@ -254,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=$? ;;
@@ -292,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=$? ;;
@@ -344,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"
@@ -360,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
@@ -430,7 +442,8 @@
 	    find . -name "*.data" -exec rm {} \;
 	    find . -name "fort.*" -exec rm {} \;
 	    find . -type l -exec rm {} \;
-	    rm -f $EXECUTABLE $RUNLOG *.txt STD* *diagnostics.log datetime
+	    #- should remove executable only if sym-link (alredy done above)
+	    rm -f $RUNLOG *.txt STD* w2_tile_topology.????.log *diagnostics.log datetime
 	    rm -rf mnc_test_*
  	    rm -f *_MIT_CE_000.opt0000 costfunction*0000
 	    echo successful
@@ -466,47 +479,54 @@
 {
     # makemodel directory
     (
+    mk_fail=0
     if test "x$NOMAKE" = xt ; then
 	cd $1;
 	if test -x $EXECUTABLE ; then
 	    echo "make skipped!"
 	else
 	    echo "no executable!"
-	    return 2
+	    mk_fail=3
 	fi
     else
 	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
-		return 1
+		mk_fail=1
 	    else
 		echo successful
 	    fi
+	else
+	    echo "no Makefile !"
+	    mk_fail=2
 	fi
     fi
+    if test "x$ADM" = xt -a -f taf_ad.log ; then
+	    head -1 taf_ad.log >> $CDIR"/summary.txt"
+	    nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`
+	    nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`
+	    echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \
+				>> $CDIR"/summary.txt"
+    fi
+    if test $mk_fail != 0 ; then return $mk_fail ; fi
     )
 }
 
 mk_mpi_size()
 {
-    # mk_mpi_size input_file output_file proc_Nb
+    # mk_mpi_size input_file output_file proc_Nb prefer_to_split_X
     #
     # make new SIZE.h (=output_file) from SIZE.h_mpi (=input_file)
     #     for an MPI build with no more than proc_Nb processors ;
@@ -515,6 +535,7 @@
     inp=$1
     out=$2
     np=$3
+    dirX=$4
     tmp=TTT.$$
 
     px=`grep "^     & *nPx *=" $inp | sed "s/^     & *nPx *= *//" | sed 's/, *$//'`
@@ -532,6 +553,13 @@
 	  if [ `expr $py % $j` -eq 0 ] ; then
 	    ij=`expr $i \* $j`
 	    if [ $ij -gt $pp ] ; then
+		flag=1
+	    elif [ $ij -eq $pp ] ; then
+		flag=$dirX
+	    else
+		flag=0
+	    fi
+	    if test $flag = 1 ; then
 	      if [ $ij -le $np ] ; then
 		ix=$i ; jy=$j ; pp=$ij
 		#echo "  ix,jy= $ix,$jy"
@@ -682,6 +710,15 @@
     (
 	cd $1
 	printf 'runmodel in %s ... ' $1
+	if test "x$MPI" != x0 ; then
+	    #- adjust the MPI run command with the right number of Procs
+	    #echo '' ; echo "  COMMAND='$COMMAND'"
+	    COMMAND=`echo $COMMAND | sed "s/ TR_NPROC / $LOC_NPROC /"`
+	    if test "x$MPI_MFILE" != x ; then
+	      COMMAND=`echo $COMMAND | sed "s/ TR_MFILE / ..\/..\/$LOC_MFILE /"`
+	    fi
+	    #echo "  COMMAND='$COMMAND'"
+	fi
 	if test -L $EXECUTABLE ; then
 	  if test -x "../"$builddir"/"$EXECUTABLE ; then
 	    cmp $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
@@ -693,15 +730,6 @@
 	    echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_tmp
 	    ln -sf "../"$builddir"/"$EXECUTABLE .
 	fi
-	if test "x$MPI" != x0 ; then
-	    #- adjust the MPI run command with the right number of Procs
-	    #echo '' ; echo "  COMMAND='$COMMAND'"
-	    COMMAND=`echo $COMMAND | sed "s/ TR_NPROC / $LOC_NPROC /"`
-	    if test "x$MPI_MFILE" != x ; then
-	      COMMAND=`echo $COMMAND | sed "s/ TR_MFILE / ..\/..\/$LOC_MFILE /"`
-	    fi
-	    #echo "  COMMAND='$COMMAND'"
-	fi
         if test ! -x $EXECUTABLE ; then
 	    rm -f $RUNLOG ; touch $RUNLOG
 	    if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
@@ -711,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=$?
@@ -730,13 +758,19 @@
 	  fi
 	fi
 	rm -f run.log_tmp
+	#- in all cases where OutputFile exists, report SIZE (and AD time)
+	if test -f $OUTPUTFILE ; then
+	  grep '(PID\.TID 0000\.0001)      n.. =' $OUTPUTFILE \
+		| sed 's/(PID.TID 0000.0001)     //' >> $CDIR"/summary.txt"
+	  if test "x$ADM" = xt ; then
+	    grep -A3 'Seconds in section "ALL' $OUTPUTFILE >> $CDIR"/summary.txt"
+	  fi
+	fi
+	if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
 	    echo successful
 	    printf '=> output from running in %s :\n' $1 1>&2
 	    tail $RUNLOG | sed 's/^.*/> &/g' 1>&2
-	    # === Reduce the size of the testing emails!
-	    #cp $OUTPUTFILE $CDIR"/"$OUTPUTFILE
-            if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	    return 0
 	elif [ $RETVAL -ne 0 -a $ENDVAL -gt 0 ] ; then
 	    #-- for some weird cases (run is finihed but with error code)
@@ -749,7 +783,6 @@
 	    printf '=> output from running in %s :\n' $1 1>&2
 	    tail $RUNLOG | sed 's/^.*/> &/g' 1>&2
 	    cp $RUNLOG $CDIR"/"$RUNLOG
-            if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
 	    return 1
 	fi
     )
@@ -851,27 +884,38 @@
 
 check_eedata()
 {
-    # check_eedata size.h eedata
+    # check_eedata eedata size.h
     if [ $# -eq 2 ] ; then
-      if test -f $1 -a -f $2 ; then
-      sx=`grep "^     & *nSx *=" $1 | sed "s/^     & *nSx *=//" | sed 's/, *$//'`
-      nx=`grep "^ *nTx *=" $2 | tail -1 | sed 's/^ *nTx *= *//' | sed "s/, *$//"`
+     if test -f $1 -a -f $2 ; then
+      nx=`grep "^ *nTx *=" $1 | tail -1 | sed 's/^ *nTx *= *//' | sed "s/, *$//"`
+      sx=`grep "^     & *nSx *=" $2 | sed "s/^     & *nSx *=//" | sed 's/, *$//'`
       if test "x$nx" = x ; then
 	rx=10
       else
 	rx=`expr $sx % $nx`
       fi
-      sy=`grep "^     & *nSy *=" $1 | sed "s/^     & *nSy *=//" | sed 's/, *$//'`
-      ny=`grep "^ *nTy *=" $2 | tail -1 | sed 's/^ *nTy *= *//' | sed "s/, *$//"`
+      ny=`grep "^ *nTy *=" $1 | tail -1 | sed 's/^ *nTy *= *//' | sed "s/, *$//"`
+      sy=`grep "^     & *nSy *=" $2 | sed "s/^     & *nSy *=//" | sed 's/, *$//'`
       if test "x$ny" = x ; then
 	ry=20
       else
 	ry=`expr $sy % $ny`
       fi
       echo `expr $rx + $ry`
-    else
+     else
       echo '-1'
-      fi
+     fi
+    elif [ $# -eq 1 ] ; then
+     if test -f $1 ; then
+      nx=`grep "^ *nTx *=" $1 | tail -1 | sed 's/^ *nTx *= *//' | sed "s/, *$//"`
+      if test "x$nx" = x ; then nx=1 ; fi
+      ny=`grep "^ *nTy *=" $1 | tail -1 | sed 's/^ *nTy *= *//' | sed "s/, *$//"`
+      if test "x$ny" = x ; then ny=1 ; fi
+     #echo $nx $ny
+      echo $nx
+     else
+      echo '-1'
+     fi
     else
       echo '-2'
     fi
@@ -884,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
@@ -913,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=
@@ -975,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 ;;
 
@@ -987,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 ;;
@@ -1011,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 ;;
@@ -1061,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"
@@ -1149,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
 
@@ -1236,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"--"
@@ -1260,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
@@ -1315,26 +1374,35 @@
 
     # Check for specific files for particular type of run
 
+    if test ! -r $CODE_DIR"/SIZE.h_mpi"  -a "x$MPI" != "x0" ; then
+	echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
+	continue
+    fi
+    if test ! -r $dir"/input/eedata.mth" -a "x$MULTI_THREAD" = "xt" ; then
+	echo "can't find \"$dir/input/eedata.mth\" -- skipping $dir"
+	continue
+    fi
+
     if test "x$MPI" != "x0" ; then
-	if test -r $CODE_DIR"/SIZE.h_mpi" ; then
-	    #- create new SIZE.h with no more than '$MPI' Procs
-	    mk_mpi_size $CODE_DIR"/SIZE.h_mpi" $BUILD_DIR"/tr_size.mpi" $MPI
-	    LOC_NPROC=$?
-	    (   cd $BUILD_DIR
-		if test -r SIZE.h.mpi ; then
-		    cmp tr_size.mpi SIZE.h.mpi > /dev/null 2>&1 ; RETVAL=$?
-		else RETVAL=1
-		fi
-		if test "x$RETVAL" = x0 ; then
-		    rm -f tr_size.mpi
-		else
-		    rm -f SIZE.h.mpi ; mv tr_size.mpi SIZE.h.mpi
-		fi
-	    )
-	else
-	    echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
-	    continue
-	fi
+	prefer_X=0
+	if test "x$MULTI_THREAD" = "xt" ; then
+	    retv=`check_eedata $dir"/input/eedata.mth"`
+	    if test $retv = 1 ; then prefer_X=1 ; fi
+	fi
+	#- create new SIZE.h with no more than '$MPI' Procs
+	mk_mpi_size $CODE_DIR"/SIZE.h_mpi" $BUILD_DIR"/tr_size.mpi" $MPI $prefer_X
+	LOC_NPROC=$?
+	(   cd $BUILD_DIR
+	    if test -r SIZE.h.mpi ; then
+		cmp tr_size.mpi SIZE.h.mpi > /dev/null 2>&1 ; RETVAL=$?
+	    else RETVAL=1
+	    fi
+	    if test "x$RETVAL" = x0 ; then
+		rm -f tr_size.mpi
+	    else
+		rm -f SIZE.h.mpi ; mv tr_size.mpi SIZE.h.mpi
+	    fi
+	)
 	if test "x$MPI_MFILE" != x ; then
 	    #- create new MPI machine-file with the right number of Procs
 	    rm -f $LOC_MFILE
@@ -1350,16 +1418,12 @@
 		echo " new LOC_MFILE=$LOC_MFILE : $nl procs for LOC_NPROC=$LOC_NPROC"
 	    fi
 	fi
-    fi
-    if test ! -r $dir"/input/eedata.mth" -a "x$MULTI_THREAD" = "xt" ; then
-	echo "can't find \"$dir/input/eedata.mth\" -- skipping $dir"
-	continue
-    fi
-    if test "x$MPI" != "x0" -a "x$MULTI_THREAD" = "xt" ; then
-	retv=`check_eedata $BUILD_DIR"/SIZE.h.mpi" $dir"/input/eedata.mth"`
-	if test $retv != 0 ; then
-	    echo "input/eedata.mth tiling misfit -- skipping $dir"
-	    continue
+	if test "x$MULTI_THREAD" = "xt" ; then
+	    retv=`check_eedata $dir"/input/eedata.mth" $BUILD_DIR"/SIZE.h.mpi"`
+	    if test $retv != 0 ; then
+		echo "input/eedata.mth tiling misfit -- skipping $dir"
+		continue
+	    fi
 	fi
     fi
 
@@ -1379,7 +1443,7 @@
 	      if test "x$MPI" = "x0" ; then
 		extra_runs="$extra_runs $name"
 	      else
-		retv=`check_eedata $BUILD_DIR"/SIZE.h.mpi" $dir"/"$exd"/eedata.mth"`
+		retv=`check_eedata $dir"/"$exd"/eedata.mth" $BUILD_DIR"/SIZE.h.mpi"`
 		if test $retv = 0 ; then
 		    extra_runs="$extra_runs $name"
 		else
@@ -1404,9 +1468,13 @@
     unset genmake makedepend make run
     results=$EMPTY_RESULTS
 
-    #  Create an output dir for each OPTFILE/tdir combination
+    #  Create an output dir & summary.txt file for each tested experiment (tdir)
     locDIR=$DRESULTS"/"$dir
     mkdir $locDIR
+    #- report to this experiment local summary file ---
+    echo "DATE='$DATE' ; tdir='$dir'" > $locDIR"/summary.txt"
+    echo "MACH='$MACH'" >> $locDIR"/summary.txt"
+    echo "UNAMEA='$UNAMEA'" >> $locDIR"/summary.txt"
     CDIR=`pwd`"/$locDIR"
 
     if test "x$NORUN" = xt ; then
@@ -1432,27 +1500,20 @@
 	fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
 	echo 1>&2
  	echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
-	touch $locDIR"/summary.txt"
 	echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"
-	echo "tdir='$dir'" >> $locDIR"/summary.txt"
-	if test "x$ADM" = xt ; then
-	    head -1 $dir/$builddir/taf_ad.log >> $locDIR"/summary.txt"
-	    nerr=`grep -c 'TAF *.* ERROR ' $dir/$builddir/taf_ad.log`
-	    nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' $dir/$builddir/taf_ad.log`
-	    echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \
-				>> $locDIR"/summary.txt"
-	    grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
-				>> $locDIR"/summary.txt"
-	fi
 
 	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
+	    #  Create an output dir & summary.txt file for each extra run (tdir.ex)
 	    locDIR=$DRESULTS"/"$dir"."$ex
 	    mkdir $locDIR
+	    #- report to this experiment local summary file ---
+	    echo "DATE='$DATE' ; tdir='$dir.$ex'" > $locDIR"/summary.txt"
+	    #echo "MACH='$MACH'" >> $locDIR"/summary.txt"
+	    #echo "UNAMEA='$UNAMEA'" >> $locDIR"/summary.txt"
 	    CDIR=`pwd`"/$locDIR"
 	    test ! -e "$dir/$pfxdir.$ex" && mkdir "$dir/$pfxdir.$ex"
 	    run_clean $dir/$pfxdir.$ex
@@ -1463,13 +1524,7 @@
 	    fres="$fres.$ex"
 	    echo 1>&2
 	    echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
-	    touch $locDIR"/summary.txt"
 	    echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"
-	    echo "tdir='$dir.$ex'" >> $locDIR"/summary.txt"
-            if test "x$ADM" = xt ; then
-	        grep -A3 'Seconds in section "ALL' $dir/$pfxdir.$ex/$OUTPUTFILE \
-			           >> $locDIR"/summary.txt"
-            fi
 	    if test "x$POSTCLEAN" = x2 ; then
 		run_clean $dir/$pfxdir.$ex
 	    fi
@@ -1497,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