--- mitgcm.org/front_content/make_summary	2007/12/25 22:01:48	1.34
+++ mitgcm.org/front_content/make_summary	2009/12/23 17:08:41	1.58
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.34 2007/12/25 22:01:48 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/front_content/make_summary,v 1.58 2009/12/23 17:08:41 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,28 @@
             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"
+#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"
 
-#  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 +86,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,66 +96,99 @@
        | Machine Type |  Nickname | 
         Notes |  
 
-       | Intel P4 |  "faulks" |  
-        Fedora Core 6  |  
-       |  Intel P4 |  "eddy" | 
-        Fedora Core 5 |  
+      
+        | Intel P4 |  "faulks" |  Fedora Core 6  |  
+      
+        |  Intel P4  |  "meander" |  Ubuntu 8.10  |  
+      
+        |  Intel P4  |  "lagoon" |  Fedora 8  |  
+      
+        |  Intel Celeron (P4)  |  "mdvia32" |  Mandriva 2009.1  |  
+      
+        |  Intel Celeron (P4)  |  "jauntyia32" |  Ubuntu 9.04  |  
+      
+        |  Opteron Barcelona  |  "harbor" |  Ubuntu 8.04 LTS (x86_64) |  
+      
+        |  Intel Xeon (Woodcrest)  |  "dickens" |  Fedora 10 (x86_64) |  
+      
+        |  Intel Core 2 duo  |  "danton" |  Fedora 11 (x86_64) |  
+
+      
+        |  ACESgrid Dell Xeon  | 
+        "aces" | Fedora Core 2 |  
+
+      
+        | Intel Xeon (Woodcrest) cluster
+         |  "beagle" | Rocks 5.2 (x86_64) |  
 
       
-
-      
 
-      
-       |  SGI Altix 350  |  "altix350" | 
-        MIT ACESgrid 
-        GeoCluster |  
-       |  IBM POWER3 SP  |  "bf" | 
-        NCAR Blackforest
+      
+        |  SGI Altix Cluster  |  "columbia" | 
+        
+        NAS Columbia  |   
+
+      
+        |  IBM POWER4 SP  |  "edvir" |   AIX 5.2  |   
+      
+        |  IBM POWER5+ SP  |  "blueice" | 
+        NCAR Blueice
          |   
 
-       |  IBM POWER4 SP  |  "bs" | 
-        NCAR Bluesky
-         |   
-       |  AMD Opteron  |  "adams" | 
-        Fedora Core 4 (AMD64) |   
+      
+        |  AMD Opteron  |  "starp" |  SuSE SLES 10 (AMD64) |   
 
+      
+        |  AMD Opteron  |  "solasrv" |  Solaris 10 |   
+      
+        |  Sun UltraSparc IV  |  "rays" |  Solaris 10 |   
       
-
-       |  Intel P4 Mosix Cluster  |  "sea" | 
-        Fedora Core 6  |   
-
-       |  AMD Opteron cluster  |  "dolphin" | 
-        SuSE SLES v8.1 |   
-
-       |  IBM/Apple dual G5  |  "two" | 
-        Mac OSX 10.3 (gcc 3.4)  |   
-
-       |  ACESgrid Dell 
-        Xeon  |  "aces" | Fedora Core 2 |   
+      
+        |  NEC SX-8  |  "sx8" |  Super-UX  |   
+      
+        |  PowerPC970MP cluster  |  "bigred" | 
+        SuSE SLES 9 (PPC)  |   
 
       
 
+      
@@ -161,7 +198,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,11 +214,10 @@
 
 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="faulks meander lagoon harbor dickens danton aces"
+MACHINES="$MACHINES beagle columbia pleiades edvir rays solssrv solasrv sx8"
+MACHINES="$MACHINES bigred starp"
 
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > ./dir_all
 
@@ -196,6 +232,7 @@
     done
     test $present = 0  &&  MACHINES="$MACHINES $madd"
 done
+#MACHINES="faulks"
 
 for mname in $MACHINES ; do
 
@@ -230,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"
@@ -241,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"
@@ -286,7 +334,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 +349,7 @@
 
 done
 
-cat >> $LATEST << EOF
+cat >> $OUTFILE << EOF
  
   | This table generated on: $the_date | 
  
@@ -320,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
     (
   |