/[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.189 by jmc, Sat Jul 20 20:32:17 2013 UTC revision 1.200 by jmc, Sun Feb 22 22:48:18 2015 UTC
# Line 11  usage() Line 11  usage()
11      echo      echo
12      echo "where possible OPTIONS are:"      echo "where possible OPTIONS are:"
13      echo "  (-help|-h)               print usage"      echo "  (-help|-h)               print usage"
14        echo " ---- type of test : ----"
15        echo "  (-tlm)                   perform a Tangent Linear run"
16        echo "  (-adm|-ad)               perform an adjoint run"
17        echo "  (-oad)                   perform an OpenAD adjoint run"
18      echo "  (-mth)                   run multi-threaded (using eedata.mth)"      echo "  (-mth)                   run multi-threaded (using eedata.mth)"
19      echo "  (-mpi)                   use MPI to compile and run on 2 processors"      echo "  (-mpi)                   use MPI to compile and run on 2 processors"
20      echo "  (-MPI)  NUMBER           use MPI to compile and run on max NUMBER procs"      echo "  (-MPI)  NUMBER           use MPI to compile and run on max NUMBER procs"
21      echo "  (-mfile|-mf) STRING      MPI: file with list of possible machines to run on"      echo "  (-mfile|-mf) STRING      MPI: file with list of possible machines to run on"
22        echo "  (-command|-c) STRING     command to run (e.g., if non-standard MPI setting)"
23        echo "                            DEF='mitgcmuv' or ='mpirun -np TR_NPROC mitgcmuv'"
24        echo " ---- testing options : ----"
25        echo "  (-optfile|-of) STRING    list of optfiles to use"
26      echo "  (-fast)                  use optfile default for compiler flags (no '-ieee')"      echo "  (-fast)                  use optfile default for compiler flags (no '-ieee')"
27      echo "                            DEF=off => use IEEE numerics option (if available)"      echo "                            DEF=off => use IEEE numerics option (if available)"
28      echo "  (-devel)                 use optfile developement flags (if available)"      echo "  (-devel)                 use optfile developement flags (if available)"
29      echo "  (-gsl)                   compile with \"-gsl\" flag"      echo "  (-gsl)                   compile with \"-gsl\" flag"
30      echo "  (-use_r4|-ur4)           if allowed, use real*4 type for '_RS' variable"      echo "  (-use_r4|-ur4)           if allowed, use real*4 type for '_RS' variable"
     echo "  (-optfile|-of) STRING    list of optfiles to use"  
     echo "  (-addr|-a) STRING        list of email recipients"  
     echo "                             (DEF=\"\" no email is sent)"  
     echo "  (-mpackdir|-mpd) DIR     location of the mpack utility"  
     echo "                             (DEF=\"../tools/mpack-1.6\")"  
31      echo "  (-tdir|-t) STRING        list of group and/or exp. dirs to test"      echo "  (-tdir|-t) STRING        list of group and/or exp. dirs to test"
32      echo "                             (recognized groups: basic, tutorials)"      echo "                             (recognized groups: basic, tutorials)"
33      echo "                             (DEF=\"\" which test all)"      echo "                             (DEF=\"\" which test all)"
# Line 32  usage() Line 35  usage()
35      echo "                              test THIS_EXP + all the following)"      echo "                              test THIS_EXP + all the following)"
36      echo "  (-skipdir|-skd) STRING   list of exp. dirs to skip"      echo "  (-skipdir|-skd) STRING   list of exp. dirs to skip"
37      echo "                             (DEF=\"\" which test all)"      echo "                             (DEF=\"\" which test all)"
38      echo "  (-bash|-b) STRING        preferred location of a \"bash\" or"      echo "  (-ts)                    provide timing information per timestep"
39      echo "                             Bourne-compatible \"sh\" shell"      echo "  (-papis)                 provide MFlop/s per timestep using PAPI"
40        echo "  (-pcls)                  provide MFlop/s per timestep using PCL"
41        echo " ---- system options : ----"
42        echo "  (-bash|-b) STRING        preferred location of a \"bash\" or \"sh\" shell"
43      echo "                             (DEF=\"\" for \"bash\")"      echo "                             (DEF=\"\" for \"bash\")"
44      echo "  (-tlm)                   perform a Tangent Linear run"      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"
45      echo "  (-adm|-ad)               perform an adjoint run"      echo "  (-ncad)                  used genmake2 option \"-nocat4ad\" (-ncad)"
     echo "  (-oad)                   perform an OpenAD adjoint run"  
     echo "  (-command|-c) STRING     command to run"  
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\")"
49      echo "  (-odir) STRING           used to build output directory name"      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
50      echo "                             (DEF=\"hostname\")"      echo " ---- output options : ----"
 #   echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"  
 #   echo "                             (DEF=\"1 2 3 4 5\")"  
51      echo "  (-match) NUMBER          Matching Criteria (number of digits)"      echo "  (-match) NUMBER          Matching Criteria (number of digits)"
52      echo "                             (DEF=\"$MATCH_CRIT\")"      echo "                             (DEF=\"$MATCH_CRIT\")"
53      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"      echo "  (-odir) STRING           used to build output directory name"
54      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"      echo "                             (DEF=\"hostname\")"
55        echo "  (-addr|-a) STRING        list of email recipients"
56        echo "                             (DEF=\"\" no email is sent)"
57        echo "  (-send)       STRING     sending command (instead of using mpack)"
58        echo "  (-savdir|-sd) STRING     location to save output tar file to send (DEF='$SAVDIR')"
59        echo "  (-mpackdir|-mpd) DIR     location of the mpack utility"
60        echo "                             (DEF=\"../tools/mpack-1.6\")"
61        echo " -- do only some parts: --"
62      echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"      echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"
63      echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"      echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
64      echo "  (-obj)                   only produces objects (=norun & no executable)"      echo "  (-obj)                   only produces objects (=norun & no executable)"
# Line 61  usage() Line 70  usage()
70      echo "  (-postclean|-pc)         after each exp. test, clean build-dir & run-dir"      echo "  (-postclean|-pc)         after each exp. test, clean build-dir & run-dir"
71      echo "  (-deloutp|-do)           delete output files after successful run"      echo "  (-deloutp|-do)           delete output files after successful run"
72      echo "  (-deldir|-dd)            on success, delete the output directory"      echo "  (-deldir|-dd)            on success, delete the output directory"
     echo "  (-ts)                    provide timing information per timestep"  
     echo "  (-papis)                 provide MFlop/s per timestep using PAPI"  
     echo "  (-pcls)                  provide MFlop/s per timestep using PCL"  
73      echo      echo
74      echo "and where STRING can be a whitespace-delimited list"      echo "and where STRING can be a whitespace-delimited list"
75      echo "such as:"      echo "such as:"
# Line 125  testoutput_var() Line 131  testoutput_var()
131          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2
132      fi      fi
133      if [ -r $1/$4/$OUTPUTFILE ]; then      if [ -r $1/$4/$OUTPUTFILE ]; then
134          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > ${TMP}a.txt
135          lncntA=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l ${TMP}a.txt | awk '{print $1}' `
136          if [ $lncntA -lt 2 ]; then          if [ $lncntA -lt 2 ]; then
137              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
138                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
139              fi              fi
140              rm -f tmp1.txt ; return 99              rm -f ${TMP}a.txt ; return 99
141          fi          fi
142      else      else
143          echo testoutput_var: $OUTPUTFILE from model run was not readable 1>&2          echo testoutput_var: $OUTPUTFILE from model run was not readable 1>&2
# Line 140  testoutput_var() Line 146  testoutput_var()
146      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
147          echo testoutput_var: grep "$2" $1/$5 1>&2          echo testoutput_var: grep "$2" $1/$5 1>&2
148      fi      fi
149      grep "$2" $1/$5 | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/$5 | sed 's/.*=//' | cat -n > ${TMP}b.txt
150      lncntB=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l ${TMP}b.txt | awk '{print $1}' `
151      if [ $lncntB -lt 2 ]; then      if [ $lncntB -lt 2 ]; then
152          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
153              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
154          fi          fi
155          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
156      fi      fi
157      if [ $lncntA -ne $lncntB ]; then      if [ $lncntA -ne $lncntB ]; then
158          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
159              echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2              echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2
160          fi          fi
161          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
162      fi      fi
163      has_nan=`cat tmp1.txt | grep -i nan | wc -l`      has_nan=`cat ${TMP}a.txt | grep -i nan | wc -l`
164      if [ $has_nan -gt 0  ] ; then      if [ $has_nan -gt 0  ] ; then
165          echo testoutput_var: $OUTPUTFILE contains $has_nan NaN values  1>&2          echo testoutput_var: $OUTPUTFILE contains $has_nan NaN values  1>&2
166          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
167      fi      fi
168      has_inf=`cat tmp1.txt | grep -i inf | wc -l`      has_inf=`cat ${TMP}a.txt | grep -i inf | wc -l`
169      if [ $has_inf -gt 0  ] ; then      if [ $has_inf -gt 0  ] ; then
170          echo testoutput_var: $OUTPUTFILE contains $has_inf Inf values  1>&2          echo testoutput_var: $OUTPUTFILE contains $has_inf Inf values  1>&2
171          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
172      fi      fi
173      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
174          echo testoutput_var: join tmp1.txt tmp2.txt 1>&2          echo testoutput_var: join ${TMP}a.txt ${TMP}b.txt 1>&2
175      fi      fi
176      join tmp1.txt tmp2.txt | awk '{print $1 " " $2 " " $3}' > tmp3.txt      # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number
177        join ${TMP}a.txt ${TMP}b.txt | awk '{print $1 " " $2 " " $3}' | sed -e 's|:||g' > ${TMP}c.txt
178      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
179          echo testoutput_var: compare_lines 1>&2          echo testoutput_var: compare_lines 1>&2
180      fi      fi
181      if [ $verbose -gt 1 ]; then      if [ $verbose -gt 1 ]; then
182          cat tmp3.txt 1>&2          cat ${TMP}c.txt 1>&2
183      fi      fi
184      echo "-1" >> tmp3.txt      echo "-1" >> ${TMP}c.txt
185      # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number      digits_of_similarity=`./tr_cmpnum < ${TMP}c.txt`
     cat tmp3.txt | sed -e 's|:||g' > tmp4.txt  
     digits_of_similarity=`./tr_cmpnum < tmp4.txt`  
186      if [ $digits_of_similarity -eq 99 ]; then      if [ $digits_of_similarity -eq 99 ]; then
187          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
188              echo testoutput_var: No comparison was available for \"$3\" 1>&2              echo testoutput_var: No comparison was available for \"$3\" 1>&2
# Line 188  testoutput_var() Line 193  testoutput_var()
193              echo There were $digits_of_similarity decimal places of similarity for \"$3\" 1>&2              echo There were $digits_of_similarity decimal places of similarity for \"$3\" 1>&2
194          fi          fi
195      fi      fi
196      rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt      rm -f ${TMP}a.txt ${TMP}b.txt ${TMP}c.txt
197    
198      return $digits_of_similarity      return $digits_of_similarity
199  }  }
# Line 327  testoutput_run() Line 332  testoutput_run()
332          '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=$? ;;
333          '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=$? ;;
334          '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=$? ;;
335             'sbo_M') testoutput_var $1 "sbo_mass"          "SBO mass"        $2 $refoutp ; yy=$? ;;
336             'sboFW') testoutput_var $1 "sbo_mass_fw"       "SBO m-FW"        $2 $refoutp ; yy=$? ;;
337             'sboAc') testoutput_var $1 "sbo_zoamc"         "SBO AM-C"        $2 $refoutp ; yy=$? ;;
338             'sboAp') testoutput_var $1 "sbo_zoamp"         "SBO AM-P"        $2 $refoutp ; yy=$? ;;
339          'StrmIc') testoutput_var $1 "STREAMICE_FP_ERR" "StreamIce Solver" $2 $refoutp ; yy=$? ;;          'StrmIc') testoutput_var $1 "STREAMICE_FP_ERR" "StreamIce Solver" $2 $refoutp ; yy=$? ;;
340                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
341            esac            esac
# Line 364  genmakemodel() Line 373  genmakemodel()
373              if test "x$MKDEPEND" != x ; then              if test "x$MKDEPEND" != x ; then
374                  command="$command -makedepend=$MKDEPEND"                  command="$command -makedepend=$MKDEPEND"
375              fi              fi
376              if test $KIND = 1 -o $KIND = 2 ; then              if test $KIND = 4 ; then
377                  command="$command --mods=../code_ad"                  command="$command -oad -mods=../$code_dir"
             elif test $KIND = 4 ; then  
                 command="$command -adof ../../../tools/adjoint_options/adjoint_oad -mods '../code_oad ../../OpenAD/code_oad_all'"  
378              else              else
379                  command="$command -mods=../code"                  command="$command -mods=../$code_dir"
380              fi              fi
381              if test "x$OPTFILE" != xNONE ; then              if test "x$OPTFILE" != xNONE ; then
382                  command="$command -optfile=$OPTFILE"                  command="$command -optfile=$OPTFILE"
# Line 396  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 426  genmakemodel() Line 436  genmakemodel()
436  makeclean()  makeclean()
437  {  {
438      # makeclean directory      # makeclean directory
439      if test "x$NODEPEND" = xf ; then rm -f $1/make.tr_log ; fi      if test "x$NOGENMAKE" = xf ; then rm -f $1/make.tr_log ; fi
440      if test "x$NOCLEAN" = xt ; then      if test "x$NOCLEAN" = xt ; then
441          echo "make Clean skipped!"          echo "make Clean skipped!"
442      else      else
# Line 458  run_clean() Line 468  run_clean()
468      if test "x$NOCLEAN" = xt ; then      if test "x$NOCLEAN" = xt ; then
469          echo "run_clean skipped!"          echo "run_clean skipped!"
470      else      else
471          (        (
472              cd $1;          cd $1;
473              printf 'clean run-dir ... '          printf 'clean run-dir ... '
474              # part of what is done after "make clean" when doing "make CLEAN"          # part of what is done after "make clean" when doing "make CLEAN"
475              find . -name "*.meta" -exec rm {} \;          find . -name "*.meta" -exec rm {} \;
476              find . -name "*.data" -exec rm {} \;          find . -name "*.data" -exec rm {} \;
477              find . -name "fort.*" -exec rm {} \;          find . -name "fort.*" -exec rm {} \;
478              find . -type l -exec rm {} \;          find . -type l -exec rm {} \;
479              #- should remove executable only if sym-link (alredy done above)          #- should remove executable only if sym-link (already done above)
480              rm -f $RUNLOG *.txt STD* w2_tile_topology.????.log *diagnostics.log datetime          rm -f $RUNLOG *.txt STDOUT.* STDERR.* *diagnostics.log *.[0-9][0-9][0-9][0-9].log
481              rm -rf mnc_test_*          rm -f datetime costfinal divided.ctrl snapshot* output_adm.*.diva_*
482              rm -f *_MIT_CE_000.opt0000 costfunction*0000          rm -f *_MIT_CE_000.opt0000 costfunction*0000
483              rm -f oad_cp.000.[0-9][0-9][0-9][0-9][0-9]          rm -f oad_cp.[0-9][0-9][0-9].?????
484              echo successful          rm -rf mnc_test_*
485              exit 0          echo successful
486          )          exit 0
487          )
488      fi      fi
489  }  }
490    
# Line 517  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 1030  SKIPDIRS= Line 1037  SKIPDIRS=
1037  MPACKDIR="../tools/mpack-1.6"  MPACKDIR="../tools/mpack-1.6"
1038  HAVE_MPACK=  HAVE_MPACK=
1039  MPACK=  MPACK=
1040    SENDCMD=
1041    SAVDIR='.'
1042  COMMAND=  COMMAND=
1043  MKDEPEND=  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 1048  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 1085  for ac_option ; do Line 1095  for ac_option ; do
1095          -mpackdir | --mpackdir | -mpd | --mpd) ac_prev=MPACKDIR ;;          -mpackdir | --mpackdir | -mpd | --mpd) ac_prev=MPACKDIR ;;
1096          -mpackdir=* | --mpackdir=* | -mpd=* | --mpd=*) MPACKDIR=$ac_optarg ;;          -mpackdir=* | --mpackdir=* | -mpd=* | --mpd=*) MPACKDIR=$ac_optarg ;;
1097    
1098            -send | --send ) ac_prev=SENDCMD ;;
1099            -send=* | --send=* ) SENDCMD=$ac_optarg ;;
1100            -savdir | --savdir | -sd | --sd ) ac_prev=SAVDIR ;;
1101            -savdir=* | --savdir=* | -sd=* | --sd=* ) SAVDIR=$ac_optarg ;;
1102    
1103          -tdir | --tdir | -t | --t) ac_prev=TESTDIRS ;;          -tdir | --tdir | -t | --t) ac_prev=TESTDIRS ;;
1104          -tdir=* | --tdir=* | -t=* | --t=*) TESTDIRS=$ac_optarg ;;          -tdir=* | --tdir=* | -t=* | --t=*) TESTDIRS=$ac_optarg ;;
1105          -skipdir | --skipdir | -skd | --skd) ac_prev=SKIPDIRS ;;          -skipdir | --skipdir | -skd | --skd) ac_prev=SKIPDIRS ;;
# Line 1102  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 1151  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 1170  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 1186  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 1224  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 1282  fi Line 1299  fi
1299    
1300  LOC_MFILE='tr_mpi_mfile'  LOC_MFILE='tr_mpi_mfile'
1301  RUNLOG="run.tr_log"  RUNLOG="run.tr_log"
1302  OUTPUTFILE=$ref_outp  if test "x$MPI" = x0 ; then
1303  if test "x$COMMAND" = x ; then    OUTPUTFILE=$ref_outp
1304      COMMAND="./$EXECUTABLE > $OUTPUTFILE"    if test "x$COMMAND" = x ; then COMMAND="./$EXECUTABLE > $OUTPUTFILE" ; fi
1305  fi  else
1306  if test "x$MPI" != x0 ; then    OUTPUTFILE="STDOUT.0000"
1307      OUTPUTFILE="STDOUT.0000"    if test "x$COMMAND" = x ; then COMMAND="mpirun -v -np TR_NPROC ./$EXECUTABLE" ; fi
1308  fi  fi
1309    
1310  echo "OK (COMMAND= $COMMAND )"  echo "OK (COMMAND='$COMMAND')"
1311    
1312    #TMP=./tr_$$
1313    #- try to put temporary files in system-local /tmp dir
1314    TMP=/tmp/tr_${USER}_$$
1315    touch $TMP ; retVal=$?
1316    if [ $retVal -eq 0 ] ; then
1317      if test ! -r $TMP ; then TMP=./tr_$$ ; fi
1318    else
1319      TMP=./tr_$$
1320    fi
1321    rm -f $TMP
1322    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 1320  else Line 1349  else
1349  fi  fi
1350    
1351  #  build the mpack utility (if ADDRESSES = NONE, do it to test the build)  #  build the mpack utility (if ADDRESSES = NONE, do it to test the build)
1352  if test "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = x -o "x$SENDCMD" != x ; then
1353      echo "skipping mpack build"      echo "skipping mpack build"
1354  else  else
1355      build_mpack      build_mpack
1356        if test "x$HAVE_MPACK" = xt ; then SENDCMD=$MPACK ; fi
1357  fi  fi
1358    
1359  #  Create a uniquely named directory to store results  #  Create a uniquely named directory to store results
# Line 1336  for xx in "$@" ; do nw=`echo $xx | wc -w Line 1366  for xx in "$@" ; do nw=`echo $xx | wc -w
1366                               CMDLINE="$CMDLINE $yy" ; fi                               CMDLINE="$CMDLINE $yy" ; fi
1367      fi      fi
1368  done  done
 #for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done  
1369  MACH=`hostname`  MACH=`hostname`
1370  UNAMEA=`uname -a`  UNAMEA=`uname -a`
1371  DATE=`date +%Y%m%d`  DATE=`date +%Y%m%d`
# Line 1344  BASE="tr_"$MACH"_"$DATE"_" Line 1373  BASE="tr_"$MACH"_"$DATE"_"
1373  if test "x$OUTDIR" != x ; then  if test "x$OUTDIR" != x ; then
1374      BASE="tr_"$OUTDIR"_"$DATE"_"      BASE="tr_"$OUTDIR"_"$DATE"_"
1375  else  else
1376      short_name=`hostname | sed 's/\..*$//'`     #short_name=`hostname -s | tr '[:upper:]' '[:lower:]'`
1377       # hostname -s is not universal (does work on AIX system)
1378        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
# Line 1462  for dir in $TESTDIRS ; do Line 1493  for dir in $TESTDIRS ; do
1493              rm -f $EXECUTABLE *.bak              rm -f $EXECUTABLE *.bak
1494              rm -f genmake_state genmake_*optfile genmake.log              rm -f genmake_state genmake_*optfile genmake.log
1495              rm -f SIZE.h.mpi genmake.tr_log make.tr_log              rm -f SIZE.h.mpi genmake.tr_log make.tr_log
1496                rm -rf mpi_headers
1497          )          )
1498          if test -d $dir/$rundir/CVS ; then          if test -d $dir/$rundir/CVS ; then
1499              echo -n '  --- dir:' $dir/$rundir ': '              echo -n '  --- dir:' $dir/$rundir ': '
# Line 1649  for dir in $TESTDIRS ; do Line 1681  for dir in $TESTDIRS ; do
1681          if test -f $dir/$builddir/Makefile ; then          if test -f $dir/$builddir/Makefile ; then
1682              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/^# //'`
1683              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
1684              sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state  #           sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
1685    # bsd-sed cannot do the above code
1686                cat $dir/$builddir/Makefile | \
1687                    sed  -n '/^# executed by:/{N
1688                                               p
1689                                               }' >> $DRESULTS/genmake_state
1690              echo " $mkOpt" >> $DRESULTS/genmake_state              echo " $mkOpt" >> $DRESULTS/genmake_state
1691              if test "x$OPTFILE" = xNONE ; then              if test "x$OPTFILE" = xNONE ; then
1692                  eval $mkOpt                  eval $mkOpt
1693                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\  #               sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\
1694                          $SUMMARY > tmp.tr_log  #                       $SUMMARY > tmp.tr_log
1695    # bsd-sed requires a newline after "a\":
1696                    sed "/^No \"OPTFILE\" was specified ; genmake2/a\\
1697                             OPTFILE=${OPTFILE}" $SUMMARY > tmp.tr_log
1698                  RETVAL=$?                  RETVAL=$?
1699                  if test "x$RETVAL" = x0 ; then rm -f $SUMMARY                  if test "x$RETVAL" = x0 ; then
1700                          cp tmp.tr_log $SUMMARY                      cp -f tmp.tr_log $SUMMARY
                 else rm -f tmp.tr_log  
1701                  fi                  fi
1702                    rm -f tmp.tr_log
1703              fi              fi
1704              gmkLog=$dir/$builddir/genmake.log              gmkLog=$dir/$builddir/genmake.log
1705              if test -r $gmkLog ; then              if test -r $gmkLog ; then
# Line 1703  date >> $SUMMARY Line 1743  date >> $SUMMARY
1743  if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
1744      echo "No results email was sent."      echo "No results email was sent."
1745  else  else
1746      if test "x$HAVE_MPACK" = xt ; then      if test "x$SENDCMD" != x ; then
1747          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \          if [ $verbose -gt 1 ]; then
1748              && gzip $DRESULTS".tar" \             echo " run: $SENDCMD -s MITgcm-test -m 3555000 ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES"
1749              && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESSES          fi
1750            tar -cf ${SAVDIR}/${DRESULTS}".tar" $DRESULTS > /dev/null 2>&1 \
1751                && gzip ${SAVDIR}/${DRESULTS}".tar" \
1752                && $SENDCMD -s MITgcm-test -m 3555000 ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES
1753          RETVAL=$?          RETVAL=$?
1754          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
1755              echo              echo
# Line 1719  else Line 1762  else
1762              echo "An email containing results was sent to the following addresses:"              echo "An email containing results was sent to the following addresses:"
1763              echo "  \"$ADDRESSES\""              echo "  \"$ADDRESSES\""
1764              echo              echo
1765              test -f $DRESULTS".tar"  &&  rm -f $DRESULTS".tar"              test -f ${SAVDIR}/${DRESULTS}".tar" &&  rm -f ${SAVDIR}/${DRESULTS}".tar"
1766              test -f $DRESULTS".tar.gz"  &&  rm -f $DRESULTS".tar.gz"              test -f ${SAVDIR}/${DRESULTS}".tar.gz" &&  rm -f ${SAVDIR}/${DRESULTS}".tar.gz"
1767          fi          fi
1768      fi      fi
1769  fi  fi
Legend:
Removed from v.1.189  
changed lines
  Added in v.1.200
  ViewVC Help
Powered by ViewVC 1.1.22