--- mitgcm.org/front_content/make_summary	2005/07/28 16:03:56	1.26
+++ mitgcm.org/front_content/make_summary	2007/09/12 22:06:05	1.30
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.26 2005/07/28 16:03:56 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.30 2007/09/12 22:06:05 jmc Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -219,8 +219,8 @@
       <tr bgcolor="#bbddff"> <td> Intel P4 Mosix Cluster </td> <td>"sea"</td>
         <td>Red Hat v7.2</td> </tr>
 
-      <tr bgcolor="#bbffdd"> <td> AMD Athlon XP 2500+</td> <td>"eddy"</td>
-        <td>Fedora Core 4</td> </tr>
+      <tr bgcolor="#bbffdd"> <td> Intel P4</td> <td>"eddy"</td>
+        <td>Fedora Core 5</td> </tr>
       <tr bgcolor="#bbddff"> <td> AMD Opteron cluster </td> <td>"dolphin"</td>
         <td>SuSE SLES v8.1</td> </tr>
 
@@ -228,7 +228,7 @@
         <td>Mac OSX 10.3 (gcc 3.4) </td> </tr>
 
       <tr bgcolor="#bbddff"> <td> <a href="http://acesgrid.org">ACESgrid Dell 
-        Xeon</a> </td> <td>"itrda"</td><td>Fedora Core 2</td> </tr>
+        Xeon</a> </td> <td>"aces"</td><td>Fedora Core 2</td> </tr>
 
       <!--
 
@@ -264,7 +264,7 @@
 
 MACHINES="faulks shelley myrinet eaps halem columbia two"
 MACHINES="$MACHINES hopper lomax turing orion bf bs slough sea"
-MACHINES="$MACHINES eddy adams dolphin hemmingway altix350"
+MACHINES="$MACHINES eddy adams dolphin hemmingway altix350 edvir"
 
 ( cd $INDIR ; ls -1 -t ) > ./dir_all
 
@@ -325,27 +325,30 @@
 	t_pass="--"
 	t_tot="--"
 	if test -r $dir/summary.txt ; then
-	    grep '^[YN] [YN] [YN] [YN] ' $dir/summary.txt > ./all_tests 2>/dev/null
+#	    grep '^[YN] [YN] [YN] [YN] ' $dir/summary.txt > ./all_tests 2>/dev/null
+	    grep '^[YN] [YN] [YN] [YN]' $dir/summary.txt > ./all_tests 2>/dev/null
 	    t_tot=`cat ./all_tests | wc -l | sed -e 's| ||g'`
-	    grep '^Y Y Y Y ' ./all_tests > ./all_ran 2>/dev/null
-	    grep advect_ ./all_ran 2>/dev/null > ./all_ran_advect
-	    t_advect=`cat ./all_ran_advect | wc -l | sed -e 's| ||g'`
-	    digits=`cat ./all_ran_advect | awk '{print $9}'`
-	    t_advect_pass=0
-	    for k in $digits ; do
-		test "x$k" = x--   &&  k=0
-		test $k -ge 9  &&  t_advect_pass=$(( $t_advect_pass + 1 ))
-	    done
-	    grep -v advect ./all_ran 2>/dev/null > ./all_ran_noadvect
-	    digits=`cat ./all_ran_noadvect | awk '{print $5}'`
-	    t_sum=0
-	    for k in $digits ; do
-		test "x$k" = x--   &&  k=0
-		test $k -ge 9  &&  t_sum=$(( $t_sum + 1 ))
-	    done
-	    t_pass=$(( $t_sum + $t_advect_pass ))
+#	    grep '^Y Y Y Y ' ./all_tests > ./all_ran 2>/dev/null
+#	    grep advect_ ./all_ran 2>/dev/null > ./all_ran_advect
+#	    t_advect=`cat ./all_ran_advect | wc -l | sed -e 's| ||g'`
+#	    digits=`cat ./all_ran_advect | awk '{print $9}'`
+#	    t_advect_pass=0
+#	    for k in $digits ; do
+#		test "x$k" = x--   &&  k=0
+#		test $k -ge 9  &&  t_advect_pass=$(( $t_advect_pass + 1 ))
+#	    done
+#	    grep -v advect ./all_ran 2>/dev/null > ./all_ran_noadvect
+#	    digits=`cat ./all_ran_noadvect | awk '{print $5}'`
+#	    t_sum=0
+#	    for k in $digits ; do
+#		test "x$k" = x--   &&  k=0
+#		test $k -ge 9  &&  t_sum=$(( $t_sum + 1 ))
+#	    done
+#	    t_pass=$(( $t_sum + $t_advect_pass ))
+	    t_pass=`grep 'pass ' ./all_tests | wc -l | sed -e 's| ||g'`
 	fi
-	rm -f ./all_tests ./all_ran ./all_ran_advect ./all_ran_noadvect
+#	rm -f ./all_tests ./all_ran ./all_ran_advect ./all_ran_noadvect
+	rm -f ./all_tests
 	# echo "${dir##*/} : $t_pass out of $t_tot"
 
 	tokens=`echo $i | sed -e 's|_| |g'`