/[MITgcm]/MITgcm/verification/testreport
ViewVC logotype

Diff of /MITgcm/verification/testreport

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.196 by jmc, Sat Jan 25 18:29:03 2014 UTC revision 1.199 by mlosch, Wed Feb 18 16:11:31 2015 UTC
# Line 331  testoutput_run() Line 331  testoutput_run()
331          'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North-av"  $2 $refoutp ; yy=$? ;;          'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North-av"  $2 $refoutp ; yy=$? ;;
332          'HthMxS') testoutput_var $1 "thSI_IceH_max_S" "thSIc H South-max" $2 $refoutp ; yy=$? ;;          'HthMxS') testoutput_var $1 "thSI_IceH_max_S" "thSIc H South-max" $2 $refoutp ; yy=$? ;;
333          'HthMxN') testoutput_var $1 "thSI_IceH_max_N" "thSIc H North-max" $2 $refoutp ; yy=$? ;;          'HthMxN') testoutput_var $1 "thSI_IceH_max_N" "thSIc H North-max" $2 $refoutp ; yy=$? ;;
334             'sbo_M') testoutput_var $1 "sbo_mass"          "SBO mass"        $2 $refoutp ; yy=$? ;;
335             'sboFW') testoutput_var $1 "sbo_mass_fw"       "SBO m-FW"        $2 $refoutp ; yy=$? ;;
336             'sboAc') testoutput_var $1 "sbo_zoamc"         "SBO AM-C"        $2 $refoutp ; yy=$? ;;
337             'sboAp') testoutput_var $1 "sbo_zoamp"         "SBO AM-P"        $2 $refoutp ; yy=$? ;;
338          'StrmIc') testoutput_var $1 "STREAMICE_FP_ERR" "StreamIce Solver" $2 $refoutp ; yy=$? ;;          'StrmIc') testoutput_var $1 "STREAMICE_FP_ERR" "StreamIce Solver" $2 $refoutp ; yy=$? ;;
339                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
340            esac            esac
# Line 1359  for xx in "$@" ; do nw=`echo $xx | wc -w Line 1363  for xx in "$@" ; do nw=`echo $xx | wc -w
1363                               CMDLINE="$CMDLINE $yy" ; fi                               CMDLINE="$CMDLINE $yy" ; fi
1364      fi      fi
1365  done  done
 #for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done  
1366  MACH=`hostname`  MACH=`hostname`
1367  UNAMEA=`uname -a`  UNAMEA=`uname -a`
1368  DATE=`date +%Y%m%d`  DATE=`date +%Y%m%d`
# Line 1367  BASE="tr_"$MACH"_"$DATE"_" Line 1370  BASE="tr_"$MACH"_"$DATE"_"
1370  if test "x$OUTDIR" != x ; then  if test "x$OUTDIR" != x ; then
1371      BASE="tr_"$OUTDIR"_"$DATE"_"      BASE="tr_"$OUTDIR"_"$DATE"_"
1372  else  else
1373      short_name=`hostname | sed 's/\..*$//'`     #short_name=`hostname -s | tr '[:upper:]' '[:lower:]'`
1374       # hostname -s is not universal (does work on AIX system)
1375       short_name=`hostname | sed 's/\..*$//' | tr '[:upper:]' '[:lower:]'`
1376      
1377      BASE="tr_"$short_name"_"$DATE"_"      BASE="tr_"$short_name"_"$DATE"_"
1378  fi  fi
1379  DNUM=0  DNUM=0
# Line 1673  for dir in $TESTDIRS ; do Line 1679  for dir in $TESTDIRS ; do
1679          if test -f $dir/$builddir/Makefile ; then          if test -f $dir/$builddir/Makefile ; then
1680              mkOpt=`grep '^# OPTFILE=' $dir/$builddir/Makefile 2>/dev/null | head -1 | sed 's/^# //'`              mkOpt=`grep '^# OPTFILE=' $dir/$builddir/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
1681              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
1682              sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state  #           sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
1683    # bsd-sed cannot do the above code
1684                cat $dir/$builddir/Makefile | \
1685                    sed  -n '/^# executed by:/{N
1686                                               p
1687                                               }' >> $DRESULTS/genmake_state
1688              echo " $mkOpt" >> $DRESULTS/genmake_state              echo " $mkOpt" >> $DRESULTS/genmake_state
1689              if test "x$OPTFILE" = xNONE ; then              if test "x$OPTFILE" = xNONE ; then
1690                  eval $mkOpt                  eval $mkOpt
1691                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\  #               sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\
1692                          $SUMMARY > tmp.tr_log  #                       $SUMMARY > tmp.tr_log
1693    # bsd-sed requires a newline after "a\":
1694                    sed "/^No \"OPTFILE\" was specified ; genmake2/a\\
1695                             OPTFILE=${OPTFILE}" $SUMMARY > tmp.tr_log
1696                  RETVAL=$?                  RETVAL=$?
1697                  if test "x$RETVAL" = x0 ; then                  if test "x$RETVAL" = x0 ; then
1698                      cp -f tmp.tr_log $SUMMARY                      cp -f tmp.tr_log $SUMMARY
Legend:
Removed from v.1.196  
changed lines
  Added in v.1.199
  ViewVC Help
Powered by ViewVC 1.1.22