/[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.199 by mlosch, Wed Feb 18 16:11:31 2015 UTC revision 1.200 by jmc, Sun Feb 22 22:48:18 2015 UTC
# Line 42  usage() Line 42  usage()
42      echo "  (-bash|-b) STRING        preferred location of a \"bash\" or \"sh\" shell"      echo "  (-bash|-b) STRING        preferred location of a \"bash\" or \"sh\" shell"
43      echo "                             (DEF=\"\" for \"bash\")"      echo "                             (DEF=\"\" for \"bash\")"
44      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"
45        echo "  (-ncad)                  used genmake2 option \"-nocat4ad\" (-ncad)"
46      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""
47      echo "  (-make|-m) STRING        command to use for \"make\""      echo "  (-make|-m) STRING        command to use for \"make\""
48      echo "                             (DEF=\"make\")"      echo "                             (DEF=\"make\")"
# Line 402  genmakemodel() Line 403  genmakemodel()
403              if test "x$EXTRFLG" != x ; then              if test "x$EXTRFLG" != x ; then
404                  command="$command -extra_flag $EXTRFLG"                  command="$command -extra_flag $EXTRFLG"
405              fi              fi
406                if test "x$NOCATAD" = xt ; then
407                    command="$command -nocat4ad"
408                fi
409              if test "x$TS" = xt ; then              if test "x$TS" = xt ; then
410                  command="$command -ts"                  command="$command -ts"
411              fi              fi
# Line 524  makemodel() Line 528  makemodel()
528          cd $1;          cd $1;
529          if test -r Makefile ; then          if test -r Makefile ; then
530              printf 'make ... '              printf 'make ... '
531              if test "x$REPLMAKE" = x ; then              $MAKE_CMD $TARG >> make.tr_log 2>&1
                 $MAKE $TARG >> make.tr_log 2>&1  
             else  
                 $REPLMAKE $TARG >> make.tr_log 2>&1  
             fi  
532              RETVAL=$?              RETVAL=$?
533              if test "x$RETVAL" != x0 ; then              if test "x$RETVAL" != x0 ; then
534                  tail make.tr_log                  tail make.tr_log
# Line 1044  MKDEPEND= Line 1044  MKDEPEND=
1044  if test "x$MAKE" = x ; then  if test "x$MAKE" = x ; then
1045      MAKE=make      MAKE=make
1046  fi  fi
1047  REPLMAKE=  MAKE_CMD=
1048  if test "x$CC" = x ; then  if test "x$CC" = x ; then
1049      CC=cc      CC=cc
1050  fi  fi
# Line 1057  OUTDIR= Line 1057  OUTDIR=
1057  DELDIR=  DELDIR=
1058  USE_R4=  USE_R4=
1059  EXTRFLG=  EXTRFLG=
1060    NOCATAD=
1061    
1062  #- type of testing (KIND):  #- type of testing (KIND):
1063  #   KIND=0 : forward (= default) ;  KIND=1 : Tangent Linear with TAF ;  #   KIND=0 : forward (= default) ;  KIND=1 : Tangent Linear with TAF ;
# Line 1116  for ac_option ; do Line 1117  for ac_option ; do
1117          -make | --make | -m | --m) ac_prev=MAKE ;;          -make | --make | -m | --m) ac_prev=MAKE ;;
1118          -make=* | --make=* | -m=* | --m=*) MAKE=$ac_optarg ;;          -make=* | --make=* | -m=* | --m=*) MAKE=$ac_optarg ;;
1119    
1120          -repl_mk | --repl_mk ) ac_prev=REPLMAKE ;;          -repl_mk | --repl_mk ) ac_prev=MAKE_CMD ;;
1121          -repl_mk=* | --repl_mk=*) REPLMAKE=$ac_optarg ;;          -repl_mk=* | --repl_mk=*) MAKE_CMD=$ac_optarg ;;
1122    
1123          -odir | --odir) ac_prev=OUTDIR ;;          -odir | --odir) ac_prev=OUTDIR ;;
1124          -odir=* | --odir=*) OUTDIR=$ac_optarg ;;          -odir=* | --odir=*) OUTDIR=$ac_optarg ;;
# Line 1165  for ac_option ; do Line 1166  for ac_option ; do
1166          -oad) if test $KIND = 0 ; then KIND=4 ; NODEPEND=t ; else          -oad) if test $KIND = 0 ; then KIND=4 ; NODEPEND=t ; else
1167                  echo "Error: '-tlm', '-adm' and '-oad' are exclusive" ; usage                  echo "Error: '-tlm', '-adm' and '-oad' are exclusive" ; usage
1168                fi ;;                fi ;;
1169            -ncad) NOCATAD=t ;;
1170    
1171          -ieee)   echo "Warning: ignore option '-ieee' (already the default)"          -ieee)   echo "Warning: ignore option '-ieee' (already the default)"
1172                   printf " ... " ;;                   printf " ... " ;;
# Line 1184  for ac_option ; do Line 1186  for ac_option ; do
1186    
1187          -ts) TS=t;;          -ts) TS=t;;
1188          -papis) PAPIS=t;;          -papis) PAPIS=t;;
1189          -pcls) PCL=t;;          -pcls) PCLS=t;;
1190    
1191          -*) echo "Error: unrecognized option: "$ac_option          -*) echo "Error: unrecognized option: "$ac_option
1192              usage ;;              usage ;;
# Line 1200  if test "x$QUICK" = xt ; then Line 1202  if test "x$QUICK" = xt ; then
1202      NOCLEAN=t      NOCLEAN=t
1203      NODEPEND=t      NODEPEND=t
1204  fi  fi
1205    if test "x$MAKE_CMD" = x ; then MAKE_CMD=$MAKE ; fi
1206    
1207  #- check length of MPI machine file:  #- check length of MPI machine file:
1208  if test "x$MPI" != x0 -a "x$MPI_MFILE" != x ; then  if test "x$MPI" != x0 -a "x$MPI_MFILE" != x ; then
# Line 1238  elif test $KIND = 4 ; then Line 1241  elif test $KIND = 4 ; then
1241      ref_outp="output_oadm.txt"      ref_outp="output_oadm.txt"
1242      EXECUTABLE="mitgcmuv_ad"      EXECUTABLE="mitgcmuv_ad"
1243  else  else
     if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi  
1244      code_dir=code      code_dir=code
1245      inputdir=input      inputdir=input
1246      ref_outp="output.txt"      ref_outp="output.txt"
1247      EXECUTABLE="mitgcmuv"      EXECUTABLE="mitgcmuv"
1248  fi  fi
1249    if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi
1250    
1251  xx=`echo $TESTDIRS | awk '{print $1}'`  xx=`echo $TESTDIRS | awk '{print $1}'`
1252  if test "x$TESTDIRS" = x ; then  if test "x$TESTDIRS" = x ; then
# Line 1306  fi Line 1309  fi
1309    
1310  echo "OK (COMMAND='$COMMAND')"  echo "OK (COMMAND='$COMMAND')"
1311    
1312  TMP=./tr_$$  #TMP=./tr_$$
1313  #- try to put temporary files in system-local /tmp dir  #- try to put temporary files in system-local /tmp dir
1314  #TMP=/tmp/tr_$$  TMP=/tmp/tr_${USER}_$$
1315  #touch $TMP ; retVal=$?  touch $TMP ; retVal=$?
1316  #if [ $retVal -eq 0 ] ; then  if [ $retVal -eq 0 ] ; then
1317  #  if test ! -r $TMP ; then TMP=./tr_$$ ; fi    if test ! -r $TMP ; then TMP=./tr_$$ ; fi
1318  #else  else
1319  #  TMP=./tr_$$    TMP=./tr_$$
1320  #fi  fi
1321  #rm -f $TMP  rm -f $TMP
1322  #if [ $verbose -gt 1 ]; then echo " temp files: $TMP" ; fi  if [ $verbose -gt 1 ]; then echo " temp files: $TMP" ; fi
1323    
1324  # set the Default List of output variables to be checked:  # set the Default List of output variables to be checked:
1325  #  (use default or load experiment-specific list from file "tr_checklist")  #  (use default or load experiment-specific list from file "tr_checklist")
# Line 1372  if test "x$OUTDIR" != x ; then Line 1375  if test "x$OUTDIR" != x ; then
1375  else  else
1376     #short_name=`hostname -s | tr '[:upper:]' '[:lower:]'`     #short_name=`hostname -s | tr '[:upper:]' '[:lower:]'`
1377     # hostname -s is not universal (does work on AIX system)     # hostname -s is not universal (does work on AIX system)
1378     short_name=`hostname | sed 's/\..*$//' | tr '[:upper:]' '[:lower:]'`      short_name=`hostname | sed 's/\..*$//' | tr '[:upper:]' '[:lower:]'`
     
1379      BASE="tr_"$short_name"_"$DATE"_"      BASE="tr_"$short_name"_"$DATE"_"
1380  fi  fi
1381  DNUM=0  DNUM=0

Legend:
Removed from v.1.199  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.22