--- mitgcm.org/scripts/check_outp	2016/11/28 20:31:34	1.49
+++ mitgcm.org/scripts/check_outp	2022/12/03 16:59:30	1.56
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.49 2016/11/28 20:31:34 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/mitgcm.org/scripts/check_outp,v 1.56 2022/12/03 16:59:30 jmc Exp $
 #
 #  The purpose of this script is to compare
 #  the latest output with the previous one (from the same platform with
@@ -105,6 +105,7 @@
 	    TANGLIN=0
 	    OPENAD=0
 	    RESTART=0
+	    Special=0
 	    EXTRA=
 	    FAST=0
 	    DVLP=0
@@ -121,21 +122,31 @@
 		  OPENAD=`grep -c '^TangLin .* OpenAD' $dir/summary.txt`
 		fi
 		RESTART=`grep -c 'test 2+2=4 summary' $dir/summary.txt`
+		#- special label for "darwin" test
+		Special=`echo $i | grep -c '\-darwin[0-9]'`
+		if test $Special != 0 ; then
+		    Special=`echo $i | sed -e "s/.*$mname/$mname/" -e "s/_/ /g" -e "s/-/ /g"`
+		    if test $dBug = 't' ; then echo -n " Special='$Special' ;" | tee -a $OUTPFIL ;  fi
+		    Special=`echo $Special | awk '{print $2}' | sed 's/darwin//'`
+		fi
 		comm=`grep '^run: .*testreport.* ' $dir/summary.txt`
 		EXTRA=`echo "$comm" | grep " -*-tdir\>" | sed -e "s/^.* -*-tdir\>//" -e "s/ -.*$//"`
 		if test "x$EXTRA" = x ; then
 		    EXTRA=`echo "$comm" | grep " -*-t\>" | sed -e "s/^.*-*-t\>//" -e "s/ -.*$//"`
 		fi
 		if test "x$EXTRA" = x ; then EXTRA=0 ; else
-		    #echo -n "EXTRA=$EXTRA"
+		    #if test $dBug = 't' ; then echo -n " EXTRA='$EXTRA' ;" | tee -a $OUTPFIL ;  fi
 		    nn0=`echo $EXTRA | sed "s/ *' *//g" | wc -w`
-		    nn1=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<monod_"`
-		    nn2=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<darwin_"`
-		    EXTRA=1
-		    if [ $nn1 -ge 2 ] ; then EXTRA=2 ; fi
-		    if [ $nn2 -ge 2 ] ; then EXTRA=3 ; fi
+		    nn1=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<darwin_"`
+		    nn2=`echo $EXTRA | sed "s/ *' *//g" | tr ' ' '\n' | grep -c "\<monod_"`
+		    EXTRA=9
+		    if [ $nn1 -ge 2 ] ; then EXTRA=1 ; fi
+		    if [ $nn2 -ge 2 ] ; then EXTRA=2 ; fi
 		    #echo " : nn0=$nn0 ; nn1=$nn1 ; nn2=$nn2"
 		fi
+		if test $dBug = 't' ; then if [ $Special -ne 0 -o $EXTRA -ne 0 ] ; then
+		    echo "	Special='$Special' ; EXTRA='$EXTRA'" | tee -a $OUTPFIL
+		fi ; fi
 		FAST=`echo "$comm" | grep -c " -*-fast\>"`
 		if test "x$FAST" = x0 ; then
 		   FAST=`echo "$comm" | grep -c " '*-noieee'*"`
@@ -150,7 +161,7 @@
 		if test "x$UR4" = x0 ; then
 		   UR4=`echo "$comm" | grep -c " -*-ur4\>"`
 		fi
-	    fi
+	    else EXTRA=0 ; fi
 	    if test "x$ADJOINT" = x1 ; then
 		kind="adm-TAF" ; order=0
 		if test "x$OPENAD" = x1 ; then kind="adm-OAD" ; order=2 ; fi
@@ -162,14 +173,14 @@
 	    else
 		kind="restart" ; order=5
 	    fi
-	    order=`expr $order + 10 \* $EXTRA`
-	    order=`printf '%3.3i' $order`
 	    if test "x$UR4" = x1 ; then
 		OPTFILE="${OPTFILE}.use_r4"
 	    fi
 	    if test "x$MPI" = x1 ; then
 		yy=`echo $OPTFILE | grep -c '+mpi'`
-		if test $yy = 0 ; then OPTFILE="${OPTFILE}+mpi" ; fi
+		if test $yy = 0 ; then yy=`echo $OPTFILE | grep -c '+impi'` ; fi
+		if test $yy = 0 ; then OPTFILE="${OPTFILE}+mpi"
+				else order=`expr $order + 200` ; fi
 	    fi
 	    if test "x$MTH" = x1 ; then
 		yy=`echo $OPTFILE | grep -c '+mth$'`
@@ -181,6 +192,12 @@
 	    if test "x$DVLP" = x1 ; then
 		OPTFILE="${OPTFILE}.dvlp"
 	    fi
+	    if [ $Special -eq 0 ] ; then
+	        order=`expr $order + 10 \* $EXTRA`
+	    else
+	        order=`expr $order + 10 \* $Special`
+	    fi
+	    order=`printf '%3.3i' $order`
 	    day=`echo $i   | sed -e 's/_[0-9]$//' | sed -e 's/_[0-9][0-9]$//'`
 	    ttt=`echo $day | sed -e 's/_[0-9]$//' | sed -e 's/_[0-9][0-9]$//'`
 	    day=`echo $ttt | sed -e 's|_| |g' |awk '{print $NF}'`
@@ -201,12 +218,12 @@
 	    echo "---- current list (n=$monthDir) :" | tee -a $OUTPFIL
 		cat $TMP.slist | tee -a $OUTPFIL
 	  fi
-          num1=`wc -l $TMP.slist | awk '{print $1}'`
+	  num1=`wc -l $TMP.slist | awk '{print $1}'`
 	  if test $num1 -gt 0 ; then
 	  echo   ".... previous list (n=$monthDir):" | tee -a $OUTPFIL
 		cat $TMP.plist | tee -a $OUTPFIL | head -20
 	  fi
-          echo "----" | tee -a $OUTPFIL
+	  echo "----" | tee -a $OUTPFIL
 	fi
 }
 
@@ -314,9 +331,9 @@
 PREV_P="${PY}_${PM}";
 PERIOD=`echo $PERIOD | sed 's/^[0-9][0-9][0-9][0-9]/&_/'`
 
-#INDIR="/net/orwell/export/export-9/mitgcm-testing/results/$PERIOD"
+#INDIR="/net/zany.mit.edu/data/ORWELL/export-9/mitgcm-testing/results/$PERIOD"
 INDIR="/u/u0/httpd/html/testing/results/$PERIOD"
-#INDIR="/u/u2/jmc/mitgcm/test_web/results/$PERIOD"
+#INDIR="$HOME/mitgcm/test_web/results/$PERIOD"
 
 #- a short summary of this checking :
 OUTPSUM=`echo $LASTDAY | sed 's/^20../_/'`
@@ -392,8 +409,8 @@
 ( cd $INDIR ; ls -1 -t */summary.txt | sed 's/\/summary.txt//' ) > $TMP.dir_all
 
 if test "x$MACHINES" = "x_All_" ; then
-  MACHINES="aces- acesgrid baudelaire engaging svante glacier uv100 ollie stan1"
-  MACHINES="$MACHINES pleiades archer stomp octopus saramago"
+  MACHINES="villon batsi engaging1 engaging- svante glacier"
+  MACHINES="$MACHINES ollie albedo pleiades archer"
 
   MALL=`cat $TMP.dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq`
   for madd in $MALL ; do
@@ -453,8 +470,8 @@
 	  fi
 	  #- discard unsafe test:
 	  dd=`echo $optf | grep -c 'gfortran+mth'`
-	  if test $mname = 'lagoon' -a $dd = 1 ; then num=-1 ; fi
-	  if test $mname = 'harbor' -a $dd = 1 ; then num=-1 ; fi
+	  #if test $mname = 'lagoon' -a $dd = 1 ; then num=-1 ; fi
+	  #if test $mname = 'harbor' -a $dd = 1 ; then num=-1 ; fi
 	  #if test $mname = 'aces' -a $optf = 'linux_ia32_open64' ; then num=-1 ; fi
 	  #if test $mname = 'aces' -a $optf = 'linux_ia32_g95' ; then num=-1 ; fi
 	  dd=`echo $optf | grep -c 'bigred.*noieee'`