Index: /issm/trunk/cron/nightlyrun.sh
===================================================================
--- /issm/trunk/cron/nightlyrun.sh	(revision 2181)
+++ /issm/trunk/cron/nightlyrun.sh	(revision 2182)
@@ -160,5 +160,5 @@
 
 #removed unused lines to deal with a smaller file
-cat nightlylong.log | egrep 'difference: |NIGHTLYRUNTERMINATEDCORRECTLY' > nightly.log
+cat nightlylong.log | egrep 'ERROR|SUCCESS|FAILURE' > nightly.log
 #rm nightlylong.log
 
Index: /issm/trunk/cron/report.sh
===================================================================
--- /issm/trunk/cron/report.sh	(revision 2181)
+++ /issm/trunk/cron/report.sh	(revision 2182)
@@ -3,12 +3,7 @@
 
 #Process log
-cat nightly.log | grep 'package: macayeal'      | grep -v "not supported yet" > macayeal.log
-cat nightly.log | grep 'package: ice'           | grep -v "not supported yet" > ice.log
-cat nightly.log | grep 'package: cielo_serial'  | grep -v "not supported yet" > cielo_serial.log
-cat nightly.log | grep 'package: cielo_parallel'| grep -v "not supported yet" > cielo_parallel.log
-cat nightly.log | grep 'NIGHTLYRUNTERMINATEDCORRECTLY'                        > check.log
-cat nightly.log | grep 'ERROR'                  | grep -v "PETSC ERROR"       > errors.log
-cat nightly.log | grep 'SUCCESS'                                              > success.log
-cat errors.log success.log                                                    > tests.log
+cat nightly.log | grep 'ERROR'   | grep -v "PETSC ERROR" > errors.log
+cat nightly.log | grep 'SUCCESS'                         > success.log
+cat nightly.log | grep 'FAILURE'                         > failures.log
 
 #create some variables
@@ -24,10 +19,4 @@
 else
 	IS_RUN=1
-fi
-if [ $(wc -l check.log | awk '{printf("%s",$1);}')  -eq 0 ] 
-then
-	IS_END=0
-else
-	IS_END=1
 fi
 
@@ -76,5 +65,5 @@
 <tr>
 $(#print status
-if [ $(echo $IS_INSTALL) = 0 ];
+if [ $(echo $IS_INSTALL) -eq 0 ];
 then
 	#installation failed, end of report
@@ -83,5 +72,5 @@
 	echo "</tr>"
 	echo "</table>"
-	rm check.log errors.log success.log tests.log
+	rm errors.log success.log
 else
 	#installation successful. Did we go to the end?
@@ -94,22 +83,17 @@
 		echo "</tr>"
 		echo "</table>"
-		rm check.log errors.log success.log tests.log
+		rm errors.log success.log failures.log 
 
 	else
 
-		if [ $(echo $IS_END) -eq 0 ];
-		then
-			echo "<td $TABLE_FONT>status: <span style=\"color:#FFA500\">stopped before the end</span></td>"
-		else
-			echo "<td $TABLE_FONT>status: <span style=\"color:#008000\">all test desks have been run</span></td>"
-		fi
+		echo "<td $TABLE_FONT>status: <span style=\"color:#008000\">all test desks have been run</span></td>"
 		echo "<td $TABLE_FONT>execution elapsed time: $ELAPSED_RUN</td>"
 		echo "</tr>"
 		echo "<tr>"
-		echo "<td $TABLE_FONT>number of errors: $(wc -l errors.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}';  rm errors.log)</td>"
+		echo "<td $TABLE_FONT>number of errors: $(wc -l errors.log | awk '{printf("%s",$1);}')/$(wc -l nightly.log | awk '{printf("%s",$1);}';  rm errors.log)</td>"
 		echo "<td $TABLE_FONT>  </td>"
 		echo "</tr>"
 		echo "<tr>"
-		echo "<td $TABLE_FONT>number of success: $(wc -l success.log | awk '{printf("%s",$1);}')/$(wc -l tests.log | awk '{printf("%s",$1);}';  rm success.log tests.log)</td>"
+		echo "<td $TABLE_FONT>number of success: $(wc -l success.log | awk '{printf("%s",$1);}')/$(wc -l nightly.log | awk '{printf("%s",$1);}'; rm success.log)</td>"
 		echo "<td $TABLE_FONT>  </td>"
 		echo "</tr>"
@@ -118,5 +102,4 @@
 		#draw a line and clean up
 		echo "<br><hr width=\"900px\">"
-		rm check.log
 	fi
 fi) 
@@ -135,73 +118,52 @@
 then
 	cat << END > content.html
-$(for  package in "macayeal" "ice" "cielo_serial" "cielo_parallel"; do
+<table $(echo $H2_STYLE)><tr><td $(echo $H2_FONT)>List of tests</td></tr></table>
+<table $(echo $BODY_STYLE) cellspacing="-1">
+<tr> 
+<th $(echo $BODY_FONT)>Result</th> 
+<th $(echo $BODY_FONT)>Tolerance</th> 
+<th $(echo $BODY_FONT)>Test name</th>  
+<th $(echo $BODY_FONT)>Analysis type</th> 
+<th $(echo $BODY_FONT)>Sub type</th> 
+<th $(echo $BODY_FONT)>Qmu</th>
+<th $(echo $BODY_FONT)>control</th>
+<th $(echo $BODY_FONT)>Control fit</th>
+<th $(echo $BODY_FONT)>Parallel</th>
+</tr>
+$( COUNTER=0
+MAX=`wc -l nightly.log | awk '{printf("%s",$1);}'`
+while [  $COUNTER -lt $MAX ]; do
+	let COUNTER=COUNTER+1 
 
-	#enter title
-	if [ $package == "macayeal" ];
-	then
-		echo "<table $H2_STYLE><tr><td $H2_FONT>Macayeal package</td></tr></table>"
+	echo "<tr>"
+
+	#see wether it is success or error (get color: red or green)
+	RESULT="$(cat nightly.log | awk '{ printf "line%so %s\n", NR, $0 }' | awk '/line'$COUNTER'o/ {printf("%s\n",$2);}';)"
+	if [ "$RESULT" = "SUCCESS" ];  
+	then 
+		color="bgcolor=#ddffdd";
+	else
+		if [ "$RESULT" = "ERROR" ];
+		then
+			color="bgcolor=#ffdddd";
+		else
+			color="bgcolor=#ddddff";
+		fi
 	fi
-	if [ $package == "ice" ];
-	then
-		echo "<table $H2_STYLE><tr><td $H2_FONT>Ice package</td></tr></table>"
-	fi
-	if [ $package == "cielo_serial" ];
-	then
-		echo "<table $H2_STYLE><tr><td $H2_FONT>Cielo serial package</td></tr></table>"
-	fi
-	if [ $package == "cielo_parallel" ];
-	then
-		echo "<table $H2_STYLE><tr><td $H2_FONT>Cielo parallel package</td></tr></table>"
-	fi
+	FONT=$(echo "$BODY_FONT $color")
 
-	#check that at least one Test exists
-	if [ `wc -l $package.log | awk '{printf("%s",$1);}'`  = "0" ]; then
+	#build html corresponding line
+	cat nightly.log | awk '{ printf "line%so %s\n", NR, $0 }' | awk -v FONT="$FONT" '
+	/line'$COUNTER'o/ { printf("<td %s>%s</td><td %s>%s%s%s</td><td %s>%s</td><td %s>%s</td><td %s>%s</td><td %s>%s</td><td %s>%s</td><td %s>%s</td><td %s>%s</td>",FONT,$2,FONT,$4,$5,$6,FONT,$8,FONT,$10,FONT,$12,FONT,$14,FONT,$16,FONT,$18,FONT,$20);}
+	';
 
-		#No Test: use a table to fix entourage bug.
-		echo "<table $NOTEST_STYLE><tr><td $NOTEST_FONT>No test found.</td></tr></table>"
-
-	else
-
-		echo "<table $BODY_STYLE cellspacing=\"-1\">"
-		echo "<tr> <th $BODY_FONT>Result</th> <th $BODY_FONT>Tolerance</th> <th $BODY_FONT>Test</th>  <th $BODY_FONT>Solution</th> <th $BODY_FONT>Field</th> </tr>"
-
-		# go through the lines of $package.log
-		COUNTER=0
-		MAX=`wc -l $package.log | awk '{printf("%s",$1);}'`
-		while [  $COUNTER -lt $MAX ]; do
-			let COUNTER=COUNTER+1 
-
-			echo "<tr>"
-
-			#see wether it is success or error (get color: red or green)
-			if [ "`cat $package.log | awk '{ printf "line%so %s\n", NR, $0 }' | awk '/line'$COUNTER'o/ {printf("%s\n",$2);}';`" == "SUCCESS" ];  
-			then 
-				color="bgcolor=#ddffdd";
-			else
-				color="bgcolor=#ffdddd";
-			fi
-			FONT=$(echo "$BODY_FONT $color")
-
-			#build html corresponding line
-			cat $package.log | awk '{ printf "line%so %s\n", NR, $0 }' | awk -v FONT="$FONT" '
-			/line'$COUNTER'o/ { printf("<td %s>%s</td><td %s> %s%s%s</td><td %s> %s</td><td %s> %s</td><td %s> %s</td>",FONT,$2,FONT,$4,$5,$6,FONT,$8,FONT,$10,FONT,$14);}
-			';
-			echo "</tr>"
-		done
-
-		echo "</table>"
-	fi
-
-	#remove log file
-	rm $package.log
+	echo "</tr>"
 
 done)
+</table>
 <br>
 END
 else
 	mktemp content.html
-	for  package in "macayeal" "ice" "cielo_serial" "cielo_parallel"; do
-		rm $package.log
-	done
 fi
 
@@ -214,5 +176,5 @@
 
 #concatenate files
-if [ $IS_RUN -eq 0 ] || [ $IS_END -eq 0 ];
+if [ $IS_RUN -eq 0 ];
 then
 	cat summary.html matlaberror.html content.html footer.html > report.html