--- mitgcm.org/front_content/make_summary	2007/12/25 17:38:26	1.32
+++ mitgcm.org/front_content/make_summary	2008/06/27 16:01:03	1.39
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.32 2007/12/25 17:38:26 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.39 2008/06/27 16:01:03 jmc Exp $
 #
 #  The purpose of this script is to create HTML summaries of the
 #  directories produced by the "parse_emails" script.
@@ -19,22 +19,23 @@
     exit 1
 }
 
+CURR_PER=`date +%Y`"_"`date +%m`
 # defaults
-PERIOD=`date +%Y`"_"`date +%m`
+PERIOD=$CURR_PER
 
 #  Parse options
 ac_prev=
 for ac_option ; do
-        
+
     # If the previous option needs an argument, assign it.
     if test -n "$ac_prev"; then
         eval "$ac_prev=\$ac_option"
         ac_prev=
         continue
     fi
-    
+
     ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-    
+
     case $ac_option in
 	
 	-help | --help | -h | --h)
@@ -44,25 +45,27 @@
             ac_prev=PERIOD ;;
         --date=* | -date=*)
             PERIOD=$ac_optarg ;;
-        
+
         *)
 	    echo "Error: don't understand argument \"$ac_option\""
 	    usage
             ;;
-        
+
      esac
-     
+
 done
 
+#INDIR="/net/orwell/export/export-9/mitgcm-testing/results/$PERIOD"
 INDIR="/u/u0/httpd/html/testing/results/$PERIOD"
 OUTDIR="/u/u0/httpd/html/testing/summary"
-OUTFILE=$OUTDIR"/summary_"$PERIOD".html"
 
-#  Create the "latest" links
+OUTFILE=$OUTDIR"/output_"$PERIOD".html"
+res_url="http://mitgcm.org/testing/"
+
+#  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
 
 
@@ -82,9 +85,9 @@
 
   
   
-    The MITgcm model is tested 
-      (compiled and run) in an automated fashion on a varirety of 
-      different machines.  The following is a summary of the MITgcm 
+    
The MITgcm model is tested
+      (compiled and run) in an automated fashion on a varirety of
+      different machines.  The following is a summary of the MITgcm
       verification suite for the time period: $PERIOD.
 
     The machine naming scheme is:
@@ -92,17 +95,26 @@
        | Machine Type |  Nickname | 
         Notes |  
 
-       | Intel P4 |  "faulks" |  
-        Fedora Core 3  |  
-       | Intel P4 |  "hemmingway" | 
-        Fedora Core 3 |  
+       | Intel P4 |  "faulks" | 
+        Fedora Core 6  |  
+       |  Intel P4 |  "eddy" | 
+        Fedora Core 5 |  
+       |  Intel P4  |  "bay" | 
+        Fedora Core 5  |  
+       |  Intel P4  |  "meander" | 
+        Fedora Core 7  |  
 
+       |  ACESgrid Dell
+        Xeon  |  "aces" | Fedora Core 2 |  
+
+      
 
       
 
+       |  SGI Altix Cluster  |  "columbia" | 
+        
+        NAS Columbia  |  
+
       
        |  SGI Altix 350  |  "altix350" | 
-        MIT ACESgrid 
+         | MIT ACESgrid
         GeoCluster |  
        |  IBM POWER3 SP  |  "bf" | 
         NCAR Blackforest
          |  
-
-       |  IBM POWER4 SP  |  "bs" | 
-        NCAR Bluesky
-         |  
-       |  AMD Opteron  |  "adams" | 
-        Fedora Core 4 (AMD64) |  
-
-       |  Sun UltraSparc  |  "slough" | 
-        Solaris 8 |  
-       |  Intel P4 Mosix Cluster  |  "sea" | 
-        Red Hat v7.2 |  
-
-       |  Intel P4 |  "eddy" | 
-        Fedora Core 5 |  
-       |  AMD Opteron cluster  |  "dolphin" | 
-        SuSE SLES v8.1 |  
-
        |  IBM/Apple dual G5  |  "two" | 
         Mac OSX 10.3 (gcc 3.4)  |  
+      -->
+       |  IBM POWER4 SP  |  "edvir" | 
+         AIX 5.2  |  
+       |  IBM POWER5+ SP  |  "blueice" | 
+        NCAR Blueice
+         |  
 
-       |  ACESgrid Dell 
-        Xeon  |  "aces" | Fedora Core 2 |  
+       |  AMD Opteron  |  "batsi" | 
+        Fedora Core 4 (AMD64) |  
+       |  AMD Opteron  |  "starp" | 
+        SuSE SLES 10 (AMD64) |  
 
+       |  Sun UltraSparc IV  |  "rays" | 
+        Solaris 9 |  
       
+       |  NEC SX-8  |  "sx8" | 
+        Super-UX  |  
+       |  Cray XD1 (AMD Opteron)  |  "xd1" | 
+        Cray HPC enhanced Linux 2.6.5  |  
+       |  PowerPC970MP cluster  |  "bigred" | 
+        SuSE SLES 9 (PPC)  |  
+
+       |  HP test-drive 
+        (Pentium III)  |  "td152" |   FreeBSD 6.2  |  
+       |  HP test-drive 
+        (Itanium II)  |  "td187" |  SuSE SLES 10  |  
+       |  HP test-drive 
+        (PA-RISC 8700)  |  "td192" |   HP-UX 11i 11.11  |  
+       |  HP test-drive 
+        (Itanium II)  |  "td194" |   HP-UX 11i v3  |  
 
-       |  Intel P4  |  "hemmingway" | 
-        Fedora Core release 1 (gcc 3.3.2)  |  
-
+      
@@ -161,7 +186,7 @@
     
       The complete output for the verification runs can be found in
       the summary pages
-      and the testing archives. 
+      and the testing archives.
       The latest reports are:
     
 
@@ -177,13 +202,12 @@
 
 color="#bbffdd"
 ncolor="#bbddff"
-res_url="http://mitgcm.org/testing/"
 
 MACHINES="faulks aces eddy bay meander"
-MACHINES="$MACHINES edvir rays1 model columbia"
-MACHINES="$MACHINES xd1 batsi starp"
+MACHINES="$MACHINES columbia edvir rays sx8 xd1"
+MACHINES="$MACHINES batsi starp"
 
-( cd $INDIR ; ls -1 -t ) > ./dir_all
+( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
 MALL=`cat ./dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
 for madd in $MALL ; do
@@ -196,6 +220,7 @@
     done
     test $present = 0  &&  MACHINES="$MACHINES $madd"
 done
+#MACHINES="faulks"
 
 for mname in $MACHINES ; do
 
@@ -247,7 +272,7 @@
 	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"
@@ -286,7 +311,7 @@
 	    optf=`echo $tline | cut -d " " -f 3`
 	    DAY=`echo $tline | cut -d " " -f 2`
 	    URL="results/$PERIOD/$ldir"
-	    cat <>$LATEST
+	    cat <>$OUTFILE
 
   |  $mname  | 
    $optf  | 
@@ -301,7 +326,7 @@
 
 done
 
-cat >> $LATEST << EOF
+cat >> $OUTFILE << EOF
 
   | This table generated on: $the_date | 
 
@@ -320,7 +345,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
     (