--- mitgcm.org/front_content/make_summary	2003/12/10 03:12:11	1.6
+++ mitgcm.org/front_content/make_summary	2004/04/02 21:51:31	1.14
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.6 2003/12/10 03:12:11 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.14 2004/04/02 21:51:31 edhill Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -157,8 +157,8 @@
     <!-- <base href="http://mitgcm.org/testing/summary/" /> -->
 
     <!-- Hinting for menu generation -->
-    <meta name="add_name_0" content="Source Code" />
-    <meta name="add_name_1" content="Testing" />
+    <meta name="add_name_0" content="Testing" />
+    <meta name="add_name_1" content="" />
     <meta name="add_name_2" content="" />
     <meta name="add_title" content="Testing" />
     <!-- Hinting for menu generation -->
@@ -177,14 +177,14 @@
 
       <tr bgcolor="#bbffdd"> <td>Intel P4</td> <td>"faulks"</td> 
         <td>Red Hat 7.3 (the "original" testing machine)</td> </tr>
-      <tr bgcolor="#bbddff"> <td>Intel P4</td> <td>"shelley"</td>
-        <td>Red Hat 9</td> </tr>
+      <tr bgcolor="#bbddff"> <td>Intel P4</td> <td>"hemmingway"</td>
+        <td>Fedora Core release 1 (gcc 3.3.2)</td> </tr>
 
       <tr bgcolor="#bbffdd"> <td> Intel P3/P4 Beowulf </td> <td>"myrinet"</td>
         <td><a href="http://mitgcm.org/projects/MITGCM_CLUSTER/">MITgcm cluster 
         facility </a></td> </tr>
       <tr bgcolor="#bbddff"> <td>Alpha cluster</td> <td>"halem"</td>
-        <td><a href="http://webserv.gsfc.nasa.gov/SCB/NCCS/systems/high-end-computing.html">
+        <td><a href="http://nccstag.gsfc.nasa.gov/halem/quickstart_halem.html">
         NASA NCCS Halem</a></td> </tr>
 
       <tr bgcolor="#bbffdd"> <td> SGI Origin 2000 </td> <td>"hopper"</td>
@@ -204,7 +204,7 @@
       <tr bgcolor="#bbffdd"> <td> IBM POWER4 SP </td> <td>"bs"</td>
         <td><a href="http://www.scd.ucar.edu/computers/bluesky/">NCAR Bluesky
         </a></td> </tr>
-      <tr bgcolor="#bbddff"> <td> AMD Opteron </td> <td>"eaps"</td>
+      <tr bgcolor="#bbddff"> <td> AMD Opteron </td> <td>"adams"</td>
         <td>SuSE Linux 9.0 (x86-64)</td> </tr>
 
       <tr bgcolor="#bbffdd"> <td> Sun UltraSparc </td> <td>"slough"</td>
@@ -212,7 +212,16 @@
       <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 release 1.91 [FC2 Test 2] (gcc 3.3.3)</td> </tr>
+      <tr bgcolor="#bbddff"> <td> AMD Opteron cluster </td> <td>"dolphin"</td>
+        <td>SuSE SLES v8.1</td> </tr>
+
       <!--
+
+      <tr bgcolor="#bbffdd"> <td> Intel P4 </td> <td>"hemmingway"</td>
+        <td>Fedora Core release 1 (gcc 3.3.2) </td> </tr>
+
       <tr bgcolor="#bbddff"> <td>  </td> <td>""</td>
         <td></td> </tr>
       -->
@@ -237,20 +246,17 @@
 EOF
 
 color="#bbffdd"
+ncolor="#bbddff"
 res_url="http://mitgcm.org/testing/"
 
 MACHINES="faulks shelley myrinet eaps halem hopper lomax orion bf bs slough sea"
+MACHINES="$MACHINES  eddy adams dolphin hemmingway"
 
 ( cd $INDIR ; ls -1 ) > ./dir_all
 
 for mname in $MACHINES ; do
 
     echo "  $mname"
-    if test "x$color" = x#bbffdd ; then
-	color="#bbddff"
-    else
-	color="#bbffdd"
-    fi
 
     dir_list=`grep $mname ./dir_all`
     echo -n "" > ./mlist
@@ -296,8 +302,14 @@
 	    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
-	    t_advect=`grep advect_ ./all_ran 2>/dev/null | wc -l | sed -e 's| ||g'`
-	    t_advect=${t_advect/ /}
+	    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
@@ -305,9 +317,9 @@
 		test "x$k" = x--   &&  k=0
 		test $k -ge 9  &&  t_sum=$(( $t_sum + 1 ))
 	    done
-	    t_pass=$(( $t_sum + $t_advect ))
+	    t_pass=$(( $t_sum + $t_advect_pass ))
 	fi
-	rm -f ./all_tests ./all_ran ./all_ran_noadvect
+	rm -f ./all_tests ./all_ran ./all_ran_advect ./all_ran_noadvect
 	# echo "${dir##*/} : $t_pass out of $t_tot"
 
 	tokens=`echo $i | sed -e 's|_| |g'`
@@ -328,6 +340,12 @@
     #  Do we have any data?  If so, create the latest pointer.
     num=`wc -l ./mlist | awk '{print $1}'`
     if test $num -gt 0 ; then
+
+	# swap colors
+        ctmp=$color
+        color=$ncolor
+        ncolor=$ctmp
+
 	keys=`cat ./mlist | cut -d " " -f 1 | sort | uniq`
 
 	for key in $keys ; do