--- MITgcm/verification/testreport	2013/07/09 22:11:47	1.186
+++ MITgcm/verification/testreport	2013/07/20 20:32:17	1.189
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.186 2013/07/09 22:11:47 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.189 2013/07/20 20:32:17 jmc Exp $
 #  $Name:  $
 #
 
@@ -547,7 +547,8 @@
 	nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`
 	if test -f taf_output ; then
 	    n2er=`grep -c 'TAF *.* ERROR ' taf_output`
-	    nerr=`expr $nerr + $n2er`
+	    n3er=`grep -c '\*ERROR\* ' taf_output`
+	    nerr=`expr $nerr + $n2er + $n3er`
 	fi
 	echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \
 				>> $CDIR"/summary.txt"
@@ -796,6 +797,23 @@
 	    # output do not exist or is older than executable:
 	    rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG
 	    if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
+	#- Divided Adjoint Run:
+	#  get the number of additional runs (add_DIVA_runs) from file "run_ADM_DIVA"
+	    if test $KIND = 2 -a -f run_ADM_DIVA ; then
+	      adm_diva_nb=`sed -n '/^ *add_DIVA_runs\>.*=/p' run_ADM_DIVA | sed 's/ //g'`
+	      echo " Divided Adjoint Run: $adm_diva_nb" >> $RUNLOG
+	      eval "let $adm_diva_nb"
+	      if [ $add_DIVA_runs -ge 1 ] ; then
+		rm -f costf* divided.ctrl snapshot*
+		echo -n "(add_DIVA_runs=$add_DIVA_runs) ... "
+		for ii in `seq 1 $add_DIVA_runs` ; do
+		  ( eval $COMMAND ) >> $RUNLOG 2>&1
+		  echo " additional DIVA run # $ii : done" >> $RUNLOG
+		  mv -f $OUTPUTFILE ${OUTPUTFILE}.diva_${ii}
+		done
+	      fi
+	    fi
+	#- special DIVA processing ends here
 	    ( eval $COMMAND ) >> $RUNLOG 2>&1
 	    RETVAL=$?
 	    ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`