--- mitgcm.org/front_content/make_summary	2004/04/02 21:51:31	1.14
+++ 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.14 2004/04/02 21:51:31 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.
@@ -176,9 +176,9 @@
         <td><b>Notes</b></td> </tr>
 
       <tr bgcolor="#bbffdd"> <td>Intel P4</td> <td>"faulks"</td> 
-        <td>Red Hat 7.3 (the "original" testing machine)</td> </tr>
+        <td>Fedora Core 3 </td> </tr>
       <tr bgcolor="#bbddff"> <td>Intel P4</td> <td>"hemmingway"</td>
-        <td>Fedora Core release 1 (gcc 3.3.2)</td> </tr>
+        <td>Fedora Core 3</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 
@@ -187,16 +187,23 @@
         <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>
         <td><a href="http://www.nas.nasa.gov/User/Systemsdocs/O2K/o2k.html">
         NAS SGI Origin 2000 </a></td> </tr>
-      <tr bgcolor="#bbddff"> <td> SGI Origin 3000 </td> <td>"lomax"</td>
+      <tr bgcolor="#bbddff"> <td> SGI Origin 3000</td><td>"lomax"/"turing"</td>
         <td><a href="http://www.nas.nasa.gov/User/Systemsdocs/O3K/o3k.html">
         NAS SGI Origin 3000 </a></td> </tr>
+      -->
 
+      <!--
       <tr bgcolor="#bbffdd"> <td> SGI Altix </td> <td>"orion"</td>
         <td><a href="http://sc.jpl.nasa.gov/">JPL Supercomputing and 
         Visualization Facility</a></td> </tr>
+      -->
+      <tr bgcolor="#bbffdd"> <td> SGI Altix 350 </td> <td>"altix350"</td>
+        <td><a href="http://acesgrid.org/geocluster/">MIT ACESgrid 
+        GeoCluster</a></td> </tr>
       <tr bgcolor="#bbddff"> <td> IBM POWER3 SP </td> <td>"bf"</td>
         <td><a href="http://www.scd.ucar.edu/computers/blackforest/">NCAR Blackforest
         </a></td> </tr>
@@ -205,18 +212,24 @@
         <td><a href="http://www.scd.ucar.edu/computers/bluesky/">NCAR Bluesky
         </a></td> </tr>
       <tr bgcolor="#bbddff"> <td> AMD Opteron </td> <td>"adams"</td>
-        <td>SuSE Linux 9.0 (x86-64)</td> </tr>
+        <td>Fedora Core 4 (AMD64)</td> </tr>
 
       <tr bgcolor="#bbffdd"> <td> Sun UltraSparc </td> <td>"slough"</td>
         <td>Solaris 8</td> </tr>
       <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="#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>
 
+      <tr bgcolor="#bbffdd"> <td> IBM/Apple dual G5 </td> <td>"two"</td>
+        <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>"aces"</td><td>Fedora Core 2</td> </tr>
+
       <!--
 
       <tr bgcolor="#bbffdd"> <td> Intel P4 </td> <td>"hemmingway"</td>
@@ -249,10 +262,23 @@
 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
+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 edvir"
+
+( cd $INDIR ; ls -1 -t ) > ./dir_all
+
+MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
+for madd in $MALL ; do
+    present=0
+    for m in $MACHINES ; do
+        echo $madd | grep $m > /dev/null 2>&1
+        RETVAL=$?
+        test $RETVAL = 0  &&  present=1
+        continue
+    done
+    test $present = 0  &&  MACHINES="$MACHINES $madd"
+done
 
 for mname in $MACHINES ; do
 
@@ -276,7 +302,7 @@
 	    OPTFILE=${OPTFILE##*/}
 	fi
 	if test "x$OPTFILE" = x ; then
-	    comm=`grep '^# OPTFILE=' $dir/*/Makefile 2>/dev/null | head -1`
+	    comm=`grep '^# OPTFILE=' $dir/*/Makefile* 2>/dev/null | head -1`
 	    comm=${comm##*#}
 	    eval $comm
 	    OPTFILE=${OPTFILE##*/}
@@ -299,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'`
@@ -349,7 +378,7 @@
 	keys=`cat ./mlist | cut -d " " -f 1 | sort | uniq`
 
 	for key in $keys ; do
-	    tline=`grep "^$key " ./mlist | sort -r | head -1`
+	    tline=`grep "^$key " ./mlist | head -1`
 	    ratio=`echo $tline | cut -d " " -f 6`
 	    ldir=`echo $tline | cut -d " " -f 5`
 	    kind=`echo $tline | cut -d " " -f 4`
@@ -378,10 +407,9 @@
 
     </table>
 
-<p>Examples of the scripts used for these testing runs can be obtained
-from <a
-href="http://dev.mitgcm.org/cgi-bin/viewcvs.cgi/MITgcm_contrib/test_scripts/">
-the "contrib" area of the MITgcm CVS archive</a>.</p>
+<p>Examples of the scripts used for these testing runs can be obtained from: <a
+href="http://mitgcm.org/cgi-bin/viewcvs.cgi/MITgcm/tools/example_scripts/">
+MITgcm/tools/example_scripts</a>.</p>
 
 
   </body>