--- mitgcm.org/scripts/check_outp 2016/11/28 20:31:34 1.49 +++ mitgcm.org/scripts/check_outp 2019/09/18 16:17:55 1.53 @@ -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.53 2019/09/18 16:17:55 jmc Exp $ # # The purpose of this script is to compare # the latest output with the previous one (from the same platform with @@ -162,14 +162,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 +181,8 @@ if test "x$DVLP" = x1 ; then OPTFILE="${OPTFILE}.dvlp" fi + order=`expr $order + 10 \* $EXTRA` + 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}'` @@ -314,9 +316,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 +394,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 baudelaire batsi engaging1 engaging- svante glacier" + MACHINES="$MACHINES ollie stan1 pleiades archer" MALL=`cat $TMP.dir_all | sed -e 's|_| |g' | awk '{print $2}' | sort | uniq` for madd in $MALL ; do