--- mitgcm.org/front_content/make_summary	2008/01/02 19:40:47	1.35
+++ mitgcm.org/front_content/make_summary	2009/10/05 16:50:09	1.57
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.35 2008/01/02 19:40:47 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.57 2009/10/05 16:50:09 jmc Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -19,8 +19,9 @@
     exit 1
 }
 
+CURR_PER=`date +%Y`"_"`date +%m`
 # defaults
-PERIOD=`date +%Y`"_"`date +%m`
+PERIOD=$CURR_PER
 
 #  Parse options
 ac_prev=
@@ -55,17 +56,17 @@
 done
 
 #INDIR="/net/orwell/export/export-9/mitgcm-testing/results/$PERIOD"
+#OUTDIR="/home/jmc/mitgcm/test_web/summary"
 INDIR="/u/u0/httpd/html/testing/results/$PERIOD"
 OUTDIR="/u/u0/httpd/html/testing/summary"
 
-OUTFILE=$OUTDIR"/summary_"$PERIOD".html"
+OUTFILE=$OUTDIR"/output_"$PERIOD".html"
 res_url="http://mitgcm.org/testing/"
 
-#  Create the "latest" links
+#  Create the links in $OUTFILE :
 echo "Creating the \"latest\" file for each machine: "
-LATEST=$OUTDIR"/latest_"$PERIOD".html"
 the_date=`date`
-cat > $LATEST << EOF
+cat > $OUTFILE << EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -95,82 +96,97 @@
       <tr bgcolor="#00cccc"> <td><b>Machine Type</b></td> <td><b>Nickname</b></td>
         <td><b>Notes</b></td> </tr>
 
-      <tr bgcolor="#bbddff"> <td>Intel P4</td> <td>"faulks"</td>
-        <td>Fedora Core 6 </td> </tr>
-      <tr bgcolor="#bbffdd"> <td> Intel P4</td> <td>"eddy"</td>
-        <td>Fedora Core 5</td> </tr>
-      <tr bgcolor="#bbddff"> <td> Intel P4 </td> <td>"bay"</td>
-        <td>Fedora Core 5 </td> </tr>
-      <tr bgcolor="#bbffdd"> <td> Intel P4 </td> <td>"meander"</td>
-        <td>Fedora Core 7 </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="#bbddff">
+        <td>Intel P4</td> <td>"faulks"</td> <td>Fedora Core 6 </td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td> Intel P4 </td> <td>"meander"</td> <td>Ubuntu 8.10 </td> </tr>
+      <tr bgcolor="#bbddff">
+        <td> Intel P4 </td> <td>"lagoon"</td> <td>Fedora 8 </td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td> Intel Celeron (P4) </td> <td>"mdvia32"</td> <td>Mandriva 2009.1 </td> </tr>
+      <tr bgcolor="#bbddff">
+        <td> Intel Celeron (P4) </td> <td>"jauntyia32"</td> <td>Ubuntu 9.04 </td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td> Opteron Barcelona </td> <td>"harbor"</td> <td>Ubuntu 8.04 LTS (x86_64)</td> </tr>
+      <tr bgcolor="#bbddff">
+        <td> Intel Xeon (Woodcrest) </td> <td>"dickens"</td> <td>Fedora 10 (x86_64)</td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td> Intel Core 2 duo </td> <td>"danton"</td> <td>Fedora 11 (x86_64)</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><a href="http://www.darwinproject.mit.edu/wiki/">Intel Xeon (Woodcrest) cluster</a>
+        </td> <td>"beagle"</td><td>Rocks 5.2 (x86_64)</td> </tr>
 
       <!--
-      <tr bgcolor="#bbffdd"> <td> Intel P3/P4 Beowulf </td> <td>"myrinet"</td>
+      <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>
+      <tr bgcolor="#bbddff">
+        <td>Alpha cluster</td> <td>"halem"</td>
         <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>
+      <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"/"turing"</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 Cluster </td> <td>"columbia"</td>
+      <tr bgcolor="#bbddff">
+        <td> SGI Altix Cluster </td> <td>"columbia"</td>
         <td><a href="http://www.nas.nasa.gov/Resources/Systems/columbia.html">
         NAS Columbia </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>
-      <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> IBM POWER4 SP </td> <td>"edvir"</td>
-        <td> AIX 5.2 </td> </tr>
-      <tr bgcolor="#bbffdd"> <td> IBM POWER5+ SP </td> <td>"blueice"</td>
+      <tr bgcolor="#bbffdd">
+        <td> IBM POWER4 SP </td> <td>"edvir"</td> <td> AIX 5.2 </td> </tr>
+      <tr bgcolor="#bbddff">
+        <td> IBM POWER5+ SP </td> <td>"blueice"</td>
         <td><a href="http://www.scd.ucar.edu/computers/blueice/">NCAR Blueice
         </a></td> </tr>
 
-      <tr bgcolor="#bbddff"> <td> AMD Opteron </td> <td>"batsi"</td>
-        <td>Fedora Core 4 (AMD64)</td> </tr>
-      <tr bgcolor="#bbffdd"> <td> AMD Opteron </td> <td>"starp"</td>
-        <td>SuSE SLES 10 (AMD64)</td> </tr>
-
-      <tr bgcolor="#bbddff"> <td> Sun UltraSparc IV </td> <td>"rays1"</td>
-        <td>Solaris 9</td> </tr>
-      <tr bgcolor="#bbffdd"> <td> Sun UltraSparc IV </td> <td>"model"</td>
-        <td>Solaris 9</td> </tr>
-      <tr bgcolor="#bbddff"> <td> Cray XD1 (AMD Opteron) </td> <td>"xd1"</td>
-        <td>Cray HPC enhanced Linux 2.6.5 </td> </tr>
-      <tr bgcolor="#bbffdd"> <td> PowerPC970MP cluster </td> <td>"bigred"</td>
+      <tr bgcolor="#bbffdd">
+        <td> AMD Opteron </td> <td>"starp"</td> <td>SuSE SLES 10 (AMD64)</td> </tr>
+
+      <tr bgcolor="#bbddff">
+        <td> AMD Opteron </td> <td>"solasrv"</td> <td>Solaris 10</td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td> Sun UltraSparc IV </td> <td>"rays"</td> <td>Solaris 10</td> </tr>
+      <!--
+        <td> Sun UltraSparc IV </td> <td>"solssrv"</td> <td>Solaris 10</td> </tr>
+        <td> Sun UltraSparc IV </td> <td>"model"</td> <td>Solaris 9</td> </tr>
+      -->
+      <tr bgcolor="#bbddff">
+        <td> NEC SX-8 </td> <td>"sx8"</td> <td>Super-UX </td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td> PowerPC970MP cluster </td> <td>"bigred"</td>
         <td>SuSE SLES 9 (PPC) </td> </tr>
 
-      <tr bgcolor="#bbddff"> <td><a
-        href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
+      <!--
+      <tr bgcolor="#bbddff">
+        <td> Cray XD1 (AMD Opteron) </td> <td>"xd1"</td>
+        <td>Cray HPC enhanced Linux 2.6.5 </td> </tr>
+      <tr bgcolor="#bbffdd">
+        <td><a href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
         (Pentium III) </td> <td>"td152"</td> <td> FreeBSD 6.2 </td> </tr>
-      <tr bgcolor="#bbffdd"> <td><a
-        href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
+      <tr bgcolor="#bbddff">
+        <td><a href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
         (Itanium II) </td> <td>"td187"</td> <td>SuSE SLES 10 </td> </tr>
-      <tr bgcolor="#bbddff"> <td><a
-        href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
-        (PA-RISC 8700) </td> <td>"td192"</td> <td> HP-UX 11i 11.11 </td> </tr>
-      <tr bgcolor="#bbffdd"> <td><a
-        href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
+      <tr bgcolor="#bbffdd">
+        <td><a href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
+        (PA-RISC 8900) </td> <td>"td191"</td> <td> HP-UX 11i 11.11 </td> </tr>
+      <tr bgcolor="#bbddff">
+        <td><a href="http://www.testdrive.hp.com/current.shtml"> HP test-drive </a>
         (Itanium II) </td> <td>"td194"</td> <td> HP-UX 11i v3 </td> </tr>
+      <tr bgcolor="#bbffdd">
+      -->
 
       <!--
       <tr bgcolor="#bbddff"> <td>  </td> <td>""</td>
@@ -199,9 +215,9 @@
 color="#bbffdd"
 ncolor="#bbddff"
 
-MACHINES="faulks aces eddy bay meander"
-MACHINES="$MACHINES edvir rays1 model columbia"
-MACHINES="$MACHINES xd1 batsi starp"
+MACHINES="faulks meander lagoon harbor dickens danton aces"
+MACHINES="$MACHINES beagle columbia edvir rays solssrv solasrv sx8"
+MACHINES="$MACHINES bigred starp"
 
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
@@ -251,10 +267,14 @@
 
 	ADJOINT=
 	RESTART=0
+	NOI3E=0
+	MTH=0
 	if test -r $dir/summary.txt ; then
 	    comm=`grep 'ADJOINT=true' $dir/summary.txt 2>/dev/null`
 	    eval $comm
 	    RESTART=`grep -c 'test 2+2=4 summary' $dir/summary.txt`
+	    NOI3E=`grep -c "^run: .*testreport.* '*-noieee'*" $dir/summary.txt`
+	    MTH=`grep -c "^run: .*testreport.* -mth " $dir/summary.txt`
 	fi
 	if test "x$RESTART" = x0 ; then
 	    kind="forward"
@@ -262,13 +282,20 @@
 	else
 	    kind="restart"
 	fi
+	if test "x$MTH" = x1 ; then
+	    yy=`echo $OPTFILE | grep -c '+mth$'`
+	    if test $yy = 0 ; then OPTFILE="${OPTFILE}+mth" ; fi
+	fi
+	if test "x$NOI3E" = x1 ; then
+	    OPTFILE="${OPTFILE}.noieee"
+	fi
 
 	t_pass="--"
 	t_tot="--"
 	if test -r $dir/summary.txt ; then
 	    grep '^[YN] [YN] [YN] [YN]' $dir/summary.txt > ./all_tests 2>/dev/null
 	    t_tot=`cat ./all_tests | wc -l | sed -e 's| ||g'`
-	    t_pass=`grep 'pass ' ./all_tests | wc -l | sed -e 's| ||g'`
+	    t_pass=`grep '^Y Y Y Y' ./all_tests | grep 'pass ' | wc -l | sed -e 's| ||g'`
 	fi
 	rm -f ./all_tests
 	# echo "${dir##*/} : $t_pass out of $t_tot"
@@ -307,7 +334,7 @@
 	    optf=`echo $tline | cut -d " " -f 3`
 	    DAY=`echo $tline | cut -d " " -f 2`
 	    URL="results/$PERIOD/$ldir"
-	    cat <<EOF >>$LATEST
+	    cat <<EOF >>$OUTFILE
 <tr bgcolor="$color">
   <td height="0"> $mname </td>
   <td> $optf </td>
@@ -322,7 +349,7 @@
 
 done
 
-cat >> $LATEST << EOF
+cat >> $OUTFILE << EOF
 <tr bgcolor="#00cccc">
   <td height="0" colspan="6" align="center" >This table generated on: $the_date</td>
 </tr>
@@ -341,7 +368,12 @@
 
 rm -f ./dir_all ./mlist
 
-CURR_PER=`date +%Y`"_"`date +%m`
+#- put the file in place
+chgrp gcmpack $OUTFILE
+chmod 664 $OUTFILE
+LATEST=$OUTDIR"/latest_"$PERIOD".html"
+mv -f $OUTFILE $LATEST
+
 if test "x$PERIOD" = "x$CURR_PER" ; then
     cp $LATEST ./testing.xml
     (
