/[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.180 by jmc, Tue Sep 4 19:27:52 2012 UTC revision 1.192 by jmc, Sun Aug 18 19:53:47 2013 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 (needed for MPI run)"
23        echo " ---- testing options : ----"
24        echo "  (-optfile|-of) STRING    list of optfiles to use"
25      echo "  (-fast)                  use optfile default for compiler flags (no '-ieee')"      echo "  (-fast)                  use optfile default for compiler flags (no '-ieee')"
26      echo "                            DEF=off => use IEEE numerics option (if available)"      echo "                            DEF=off => use IEEE numerics option (if available)"
27      echo "  (-devel)                 use optfile developement flags (if available)"      echo "  (-devel)                 use optfile developement flags (if available)"
28      echo "  (-gsl)                   compile with \"-gsl\" flag"      echo "  (-gsl)                   compile with \"-gsl\" flag"
29      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\")"  
30      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"
31      echo "                             (recognized groups: basic, tutorials)"      echo "                             (recognized groups: basic, tutorials)"
32      echo "                             (DEF=\"\" which test all)"      echo "                             (DEF=\"\" which test all)"
# Line 32  usage() Line 34  usage()
34      echo "                              test THIS_EXP + all the following)"      echo "                              test THIS_EXP + all the following)"
35      echo "  (-skipdir|-skd) STRING   list of exp. dirs to skip"      echo "  (-skipdir|-skd) STRING   list of exp. dirs to skip"
36      echo "                             (DEF=\"\" which test all)"      echo "                             (DEF=\"\" which test all)"
37      echo "  (-bash|-b) STRING        preferred location of a \"bash\" or"      echo "  (-ts)                    provide timing information per timestep"
38      echo "                             Bourne-compatible \"sh\" shell"      echo "  (-papis)                 provide MFlop/s per timestep using PAPI"
39        echo "  (-pcls)                  provide MFlop/s per timestep using PCL"
40        echo " ---- system options : ----"
41        echo "  (-bash|-b) STRING        preferred location of a \"bash\" or \"sh\" shell"
42      echo "                             (DEF=\"\" for \"bash\")"      echo "                             (DEF=\"\" for \"bash\")"
43      echo "  (-tlm)                   perform a Tangent Linear run"      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"
     echo "  (-adm|-ad)               perform an adjoint run"  
     echo "  (-oad)                   perform an OpenAD adjoint run"  
     echo "  (-command|-c) STRING     command to run"  
44      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""
45      echo "  (-make|-m) STRING        command to use for \"make\""      echo "  (-make|-m) STRING        command to use for \"make\""
46      echo "                             (DEF=\"make\")"      echo "                             (DEF=\"make\")"
47      echo "  (-odir) STRING           used to build output directory name"      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
48      echo "                             (DEF=\"hostname\")"      echo " ---- output options : ----"
 #   echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"  
 #   echo "                             (DEF=\"1 2 3 4 5\")"  
49      echo "  (-match) NUMBER          Matching Criteria (number of digits)"      echo "  (-match) NUMBER          Matching Criteria (number of digits)"
50      echo "                             (DEF=\"$MATCH_CRIT\")"      echo "                             (DEF=\"$MATCH_CRIT\")"
51      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"      echo "  (-odir) STRING           used to build output directory name"
52      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"      echo "                             (DEF=\"hostname\")"
53        echo "  (-addr|-a) STRING        list of email recipients"
54        echo "                             (DEF=\"\" no email is sent)"
55        echo "  (-send)       STRING     sending command (instead of using mpack)"
56        echo "  (-savdir|-sd) STRING     location to save output tar file to send (DEF='$SAVDIR')"
57        echo "  (-mpackdir|-mpd) DIR     location of the mpack utility"
58        echo "                             (DEF=\"../tools/mpack-1.6\")"
59        echo " -- do only some parts: --"
60      echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"      echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"
61      echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"      echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
62      echo "  (-obj)                   only produces objects (=norun & no executable)"      echo "  (-obj)                   only produces objects (=norun & no executable)"
# Line 61  usage() Line 68  usage()
68      echo "  (-postclean|-pc)         after each exp. test, clean build-dir & run-dir"      echo "  (-postclean|-pc)         after each exp. test, clean build-dir & run-dir"
69      echo "  (-deloutp|-do)           delete output files after successful run"      echo "  (-deloutp|-do)           delete output files after successful run"
70      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"  
71      echo      echo
72      echo "and where STRING can be a whitespace-delimited list"      echo "and where STRING can be a whitespace-delimited list"
73      echo "such as:"      echo "such as:"
# Line 125  testoutput_var() Line 129  testoutput_var()
129          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2
130      fi      fi
131      if [ -r $1/$4/$OUTPUTFILE ]; then      if [ -r $1/$4/$OUTPUTFILE ]; then
132          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > ${TMP}a.txt
133          lncntA=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l ${TMP}a.txt | awk '{print $1}' `
134          if [ $lncntA -lt 2 ]; then          if [ $lncntA -lt 2 ]; then
135              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
136                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
137              fi              fi
138              rm -f tmp1.txt ; return 99              rm -f ${TMP}a.txt ; return 99
139          fi          fi
140      else      else
141          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 144  testoutput_var()
144      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
145          echo testoutput_var: grep "$2" $1/$5 1>&2          echo testoutput_var: grep "$2" $1/$5 1>&2
146      fi      fi
147      grep "$2" $1/$5 | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/$5 | sed 's/.*=//' | cat -n > ${TMP}b.txt
148      lncntB=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l ${TMP}b.txt | awk '{print $1}' `
149      if [ $lncntB -lt 2 ]; then      if [ $lncntB -lt 2 ]; then
150          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
151              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
152          fi          fi
153          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
154      fi      fi
155      if [ $lncntA -ne $lncntB ]; then      if [ $lncntA -ne $lncntB ]; then
156          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
157              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
158          fi          fi
159          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
160      fi      fi
161      has_nan=`cat tmp1.txt | grep -i nan | wc -l`      has_nan=`cat ${TMP}a.txt | grep -i nan | wc -l`
162      if [ $has_nan -gt 0  ] ; then      if [ $has_nan -gt 0  ] ; then
163          echo testoutput_var: $OUTPUTFILE contains $has_nan NaN values  1>&2          echo testoutput_var: $OUTPUTFILE contains $has_nan NaN values  1>&2
164          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
165      fi      fi
166      has_inf=`cat tmp1.txt | grep -i inf | wc -l`      has_inf=`cat ${TMP}a.txt | grep -i inf | wc -l`
167      if [ $has_inf -gt 0  ] ; then      if [ $has_inf -gt 0  ] ; then
168          echo testoutput_var: $OUTPUTFILE contains $has_inf Inf values  1>&2          echo testoutput_var: $OUTPUTFILE contains $has_inf Inf values  1>&2
169          rm -f tmp1.txt tmp2.txt ; return 99          rm -f ${TMP}a.txt ${TMP}b.txt ; return 99
170      fi      fi
171      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
172          echo testoutput_var: join tmp1.txt tmp2.txt 1>&2          echo testoutput_var: join ${TMP}a.txt ${TMP}b.txt 1>&2
173      fi      fi
174      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
175        join ${TMP}a.txt ${TMP}b.txt | awk '{print $1 " " $2 " " $3}' | sed -e 's|:||g' > ${TMP}c.txt
176      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
177          echo testoutput_var: compare_lines 1>&2          echo testoutput_var: compare_lines 1>&2
178      fi      fi
179      if [ $verbose -gt 1 ]; then      if [ $verbose -gt 1 ]; then
180          cat tmp3.txt 1>&2          cat ${TMP}c.txt 1>&2
181      fi      fi
182      echo "-1" >> tmp3.txt      echo "-1" >> ${TMP}c.txt
183      # 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`  
184      if [ $digits_of_similarity -eq 99 ]; then      if [ $digits_of_similarity -eq 99 ]; then
185          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
186              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 191  testoutput_var()
191              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
192          fi          fi
193      fi      fi
194      rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt      rm -f ${TMP}a.txt ${TMP}b.txt ${TMP}c.txt
195    
196      return $digits_of_similarity      return $digits_of_similarity
197  }  }
# Line 322  testoutput_run() Line 325  testoutput_run()
325          'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $refoutp ; yy=$? ;;          'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $refoutp ; yy=$? ;;
326          'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $refoutp ; yy=$? ;;          'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $refoutp ; yy=$? ;;
327          'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $refoutp ; yy=$? ;;          'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $refoutp ; yy=$? ;;
328          'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Global"    $2 $refoutp ; yy=$? ;;          'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Glob-ave"  $2 $refoutp ; yy=$? ;;
329          'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South"     $2 $refoutp ; yy=$? ;;          'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South-av"  $2 $refoutp ; yy=$? ;;
330          'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North"     $2 $refoutp ; yy=$? ;;          'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North-av"  $2 $refoutp ; yy=$? ;;
331            'HthMxS') testoutput_var $1 "thSI_IceH_max_S" "thSIc H South-max" $2 $refoutp ; yy=$? ;;
332            'HthMxN') testoutput_var $1 "thSI_IceH_max_N" "thSIc H North-max" $2 $refoutp ; yy=$? ;;
333            'StrmIc') testoutput_var $1 "STREAMICE_FP_ERR" "StreamIce Solver" $2 $refoutp ; yy=$? ;;
334                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
335            esac            esac
336            if test $xx = $sVar            if test $xx = $sVar
# Line 455  run_clean() Line 461  run_clean()
461      if test "x$NOCLEAN" = xt ; then      if test "x$NOCLEAN" = xt ; then
462          echo "run_clean skipped!"          echo "run_clean skipped!"
463      else      else
464          (        (
465              cd $1;          cd $1;
466              printf 'clean run-dir ... '          printf 'clean run-dir ... '
467              # part of what is done after "make clean" when doing "make CLEAN"          # part of what is done after "make clean" when doing "make CLEAN"
468              find . -name "*.meta" -exec rm {} \;          find . -name "*.meta" -exec rm {} \;
469              find . -name "*.data" -exec rm {} \;          find . -name "*.data" -exec rm {} \;
470              find . -name "fort.*" -exec rm {} \;          find . -name "fort.*" -exec rm {} \;
471              find . -type l -exec rm {} \;          find . -type l -exec rm {} \;
472              #- should remove executable only if sym-link (alredy done above)          #- should remove executable only if sym-link (already done above)
473              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
474              rm -rf mnc_test_*          rm -f datetime costfinal divided.ctrl snapshot* output_adm.*.diva_*
475              rm -f *_MIT_CE_000.opt0000 costfunction*0000          rm -f *_MIT_CE_000.opt0000 costfunction*0000
476              echo successful          rm -f oad_cp.[0-9][0-9][0-9].?????
477              exit 0          rm -rf mnc_test_*
478          )          echo successful
479            exit 0
480          )
481      fi      fi
482  }  }
483    
# Line 535  makemodel() Line 543  makemodel()
543          fi          fi
544      fi      fi
545      if test $KIND = 1 -a -f taf_ftl.log ; then      if test $KIND = 1 -a -f taf_ftl.log ; then
546              head -1 taf_ftl.log >> $CDIR"/summary.txt"          head -1 taf_ftl.log >> $CDIR"/summary.txt"
547      fi      fi
548      if test $KIND = 2 -a -f taf_ad.log ; then      if test $KIND = 2 -a -f taf_ad.log ; then
549              head -1 taf_ad.log >> $CDIR"/summary.txt"          head -1 taf_ad.log >> $CDIR"/summary.txt"
550              nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`          nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`
551              nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`          nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`
552              echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \          if test -f taf_output ; then
553                n2er=`grep -c 'TAF *.* ERROR ' taf_output`
554                n3er=`grep -c '\*ERROR\* ' taf_output`
555                nerr=`expr $nerr + $n2er + $n3er`
556            fi
557            echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \
558                                  >> $CDIR"/summary.txt"                                  >> $CDIR"/summary.txt"
559      fi      fi
560      if test $mk_fail != 0 ; then return $mk_fail ; fi      if test $mk_fail != 0 ; then return $mk_fail ; fi
# Line 788  runmodel() Line 801  runmodel()
801              # output do not exist or is older than executable:              # output do not exist or is older than executable:
802              rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG              rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG
803              if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi              if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
804            #- Divided Adjoint Run:
805            #  get the number of additional runs (add_DIVA_runs) from file "run_ADM_DIVA"
806                if test $KIND = 2 -a -f run_ADM_DIVA ; then
807                  adm_diva_nb=`sed -n '/^ *add_DIVA_runs\>.*=/p' run_ADM_DIVA | sed 's/ //g'`
808                  echo " Divided Adjoint Run: $adm_diva_nb" >> $RUNLOG
809                  eval "let $adm_diva_nb"
810                  if [ $add_DIVA_runs -ge 1 ] ; then
811                    rm -f costf* divided.ctrl snapshot*
812                    echo -n "(add_DIVA_runs=$add_DIVA_runs) ... "
813                    for ii in `seq 1 $add_DIVA_runs` ; do
814                      ( eval $COMMAND ) >> $RUNLOG 2>&1
815                      echo " additional DIVA run # $ii : done" >> $RUNLOG
816                      mv -f $OUTPUTFILE ${OUTPUTFILE}.diva_${ii}
817                    done
818                  fi
819                fi
820            #- special DIVA processing ends here
821              ( eval $COMMAND ) >> $RUNLOG 2>&1              ( eval $COMMAND ) >> $RUNLOG 2>&1
822              RETVAL=$?              RETVAL=$?
823              ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`              ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`
# Line 912  formatresults() Line 942  formatresults()
942          fi          fi
943      fi      fi
944      printf '  %s' $nm      printf '  %s' $nm
945        if test $KIND = 2 ; then
946            #-- apppend taf repport summary:
947            tafrep=`grep -c '^ TAF reports ' $CDIR/summary.txt`
948            if test $tafrep = 1 ; then
949                grep '^ TAF reports ' $CDIR/summary.txt | awk '{printf "  (e=%i, w=%i)",$3,$6}'
950            fi
951        fi
952      printf '\n'      printf '\n'
953    
954  }  }
# Line 997  SKIPDIRS= Line 1034  SKIPDIRS=
1034  MPACKDIR="../tools/mpack-1.6"  MPACKDIR="../tools/mpack-1.6"
1035  HAVE_MPACK=  HAVE_MPACK=
1036  MPACK=  MPACK=
1037    SENDCMD=
1038    SAVDIR='.'
1039  COMMAND=  COMMAND=
1040  MKDEPEND=  MKDEPEND=
1041  if test "x$MAKE" = x ; then  if test "x$MAKE" = x ; then
# Line 1052  for ac_option ; do Line 1091  for ac_option ; do
1091          -mpackdir | --mpackdir | -mpd | --mpd) ac_prev=MPACKDIR ;;          -mpackdir | --mpackdir | -mpd | --mpd) ac_prev=MPACKDIR ;;
1092          -mpackdir=* | --mpackdir=* | -mpd=* | --mpd=*) MPACKDIR=$ac_optarg ;;          -mpackdir=* | --mpackdir=* | -mpd=* | --mpd=*) MPACKDIR=$ac_optarg ;;
1093    
1094            -send | --send ) ac_prev=SENDCMD ;;
1095            -send=* | --send=* ) SENDCMD=$ac_optarg ;;
1096            -savdir | --savdir | -sd | --sd ) ac_prev=SAVDIR ;;
1097            -savdir=* | --savdir=* | -sd=* | --sd=* ) SAVDIR=$ac_optarg ;;
1098    
1099          -tdir | --tdir | -t | --t) ac_prev=TESTDIRS ;;          -tdir | --tdir | -t | --t) ac_prev=TESTDIRS ;;
1100          -tdir=* | --tdir=* | -t=* | --t=*) TESTDIRS=$ac_optarg ;;          -tdir=* | --tdir=* | -t=* | --t=*) TESTDIRS=$ac_optarg ;;
1101          -skipdir | --skipdir | -skd | --skd) ac_prev=SKIPDIRS ;;          -skipdir | --skipdir | -skd | --skd) ac_prev=SKIPDIRS ;;
# Line 1259  fi Line 1303  fi
1303    
1304  echo "OK (COMMAND= $COMMAND )"  echo "OK (COMMAND= $COMMAND )"
1305    
1306    TMP=./tr_$$
1307    #- try to put temporary files in system-local /tmp dir
1308    #TMP=/tmp/tr_$$
1309    #touch $TMP ; retVal=$?
1310    #if [ $retVal -eq 0 ] ; then
1311    #  if test ! -r $TMP ; then TMP=./tr_$$ ; fi
1312    #else
1313    #  TMP=./tr_$$
1314    #fi
1315    #rm -f $TMP
1316    #if [ $verbose -gt 1 ]; then echo " temp files: $TMP" ; fi
1317    
1318  # set the Default List of output variables to be checked:  # set the Default List of output variables to be checked:
1319  #  (use default or load experiment-specific list from file "tr_checklist")  #  (use default or load experiment-specific list from file "tr_checklist")
1320  # content : 1rst = main variable used to decide if it pass or FAIL  # content : 1rst = main variable used to decide if it pass or FAIL
# Line 1287  else Line 1343  else
1343  fi  fi
1344    
1345  #  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)
1346  if test "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = x -o "x$SENDCMD" != x ; then
1347      echo "skipping mpack build"      echo "skipping mpack build"
1348  else  else
1349      build_mpack      build_mpack
1350        if test "x$HAVE_MPACK" = xt ; then SENDCMD=$MPACK ; fi
1351  fi  fi
1352    
1353  #  Create a uniquely named directory to store results  #  Create a uniquely named directory to store results
# Line 1376  if test $KIND = 0 ; then Line 1433  if test $KIND = 0 ; then
1433  else  else
1434      line_0=`printf '%s %2i' 'default   ' $MATCH_CRIT`      line_0=`printf '%s %2i' 'default   ' $MATCH_CRIT`
1435    if test $KIND = 1 ; then    if test $KIND = 1 ; then
1436      echo "TANGLIN=true" >> $SUMMARY     #echo "TANGLIN=true" >> $SUMMARY
1437        echo "TangLin generated by TAF" >> $SUMMARY
1438      elif test $KIND = 3 ; then
1439        echo "TangLin generated by OpenAD" >> $SUMMARY
1440      elif test $KIND = 2 ; then
1441       #echo "ADJOINT=true" >> $SUMMARY
1442        echo "Adjoint generated by TAF" >> $SUMMARY
1443      else
1444        echo "Adjoint generated by OpenAD" >> $SUMMARY
1445      fi
1446      if test $KIND = 1 -o $KIND = 3 ; then
1447      line_1="G D M    C  T  F"      line_1="G D M    C  T  F"
1448      line_2="e p a R  o  L  D"      line_2="e p a R  o  L  D"
1449    else    else
     echo "ADJOINT=true" >> $SUMMARY  
1450      line_1="G D M    C  A  F"      line_1="G D M    C  A  F"
1451      line_2="e p a R  o  d  D"      line_2="e p a R  o  d  D"
1452    fi    fi
# Line 1420  for dir in $TESTDIRS ; do Line 1486  for dir in $TESTDIRS ; do
1486              rm -f $EXECUTABLE *.bak              rm -f $EXECUTABLE *.bak
1487              rm -f genmake_state genmake_*optfile genmake.log              rm -f genmake_state genmake_*optfile genmake.log
1488              rm -f SIZE.h.mpi genmake.tr_log make.tr_log              rm -f SIZE.h.mpi genmake.tr_log make.tr_log
1489                rm -rf mpi_headers
1490          )          )
1491          if test -d $dir/$rundir/CVS ; then          if test -d $dir/$rundir/CVS ; then
1492              echo -n '  --- dir:' $dir/$rundir ': '              echo -n '  --- dir:' $dir/$rundir ': '
# Line 1504  for dir in $TESTDIRS ; do Line 1571  for dir in $TESTDIRS ; do
1571      #  Check whether there are "extra runs" for this testdir      #  Check whether there are "extra runs" for this testdir
1572      extra_runs=      extra_runs=
1573      if test "x$NORUN" = xf ; then      if test "x$NORUN" = xf ; then
1574          ex_run_dirs=`( cd $dir ; echo $inputdir.* )`          ex_run_dirs=`( cd $dir ; ls -d $inputdir.* 2> /dev/null )`
1575      fi      fi
1576      #echo "ex_run_dirs='$ex_run_dirs'"      #echo "ex_run_dirs='$ex_run_dirs'"
1577      for exd in $ex_run_dirs ; do      for exd in $ex_run_dirs ; do
1578          name=`echo $exd | sed -e "s/$inputdir\.//"`          name=`echo $exd | sed -e "s/$inputdir\.//"`
1579          refExOut=`echo $ref_outp | sed "s/\./.${name}./"`          refExOut=`echo $ref_outp | sed "s/\./.${name}./"`
1580          outf="$dir/results/$refExOut"          outf="$dir/results/$refExOut"
         #if test -f $outf -a -r $outf ; then  
1581          if test -r $outf -o -r ${outf}.gz ; then          if test -r $outf -o -r ${outf}.gz ; then
1582            if test "x$MULTI_THREAD" = "xt" ; then            if test "x$MULTI_THREAD" = "xt" ; then
1583              if test -r $dir"/"$exd"/eedata.mth" ; then              if test -r $dir"/"$exd"/eedata.mth" ; then
# Line 1595  for dir in $TESTDIRS ; do Line 1661  for dir in $TESTDIRS ; do
1661              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir
1662              runmodel $dir/$pfxdir.$ex && run=Y \              runmodel $dir/$pfxdir.$ex && run=Y \
1663              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`
1664              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir.$ex ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
             fres="$fres.$ex"  
1665              echo 1>&2              echo 1>&2
1666              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1667              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"
# Line 1616  for dir in $TESTDIRS ; do Line 1681  for dir in $TESTDIRS ; do
1681                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\
1682                          $SUMMARY > tmp.tr_log                          $SUMMARY > tmp.tr_log
1683                  RETVAL=$?                  RETVAL=$?
1684                  if test "x$RETVAL" = x0 ; then rm -f $SUMMARY                  if test "x$RETVAL" = x0 ; then
1685                          cp tmp.tr_log $SUMMARY                      cp -f tmp.tr_log $SUMMARY
                 else rm -f tmp.tr_log  
1686                  fi                  fi
1687                    rm -f tmp.tr_log
1688              fi              fi
1689              gmkLog=$dir/$builddir/genmake.log              gmkLog=$dir/$builddir/genmake.log
1690              if test -r $gmkLog ; then              if test -r $gmkLog ; then
# Line 1663  date >> $SUMMARY Line 1728  date >> $SUMMARY
1728  if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
1729      echo "No results email was sent."      echo "No results email was sent."
1730  else  else
1731      if test "x$HAVE_MPACK" = xt ; then      if test "x$SENDCMD" != x ; then
1732          tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \          if [ $verbose -gt 1 ]; then
1733              && gzip $DRESULTS".tar" \             echo " run: $SENDCMD -s MITgcm-test -m 3555000 ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES"
1734              && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESSES          fi
1735            tar -cf ${SAVDIR}/${DRESULTS}".tar" $DRESULTS > /dev/null 2>&1 \
1736                && gzip ${SAVDIR}/${DRESULTS}".tar" \
1737                && $SENDCMD -s MITgcm-test -m 3555000 ${SAVDIR}/${DRESULTS}".tar.gz" $ADDRESSES
1738          RETVAL=$?          RETVAL=$?
1739          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
1740              echo              echo
# Line 1679  else Line 1747  else
1747              echo "An email containing results was sent to the following addresses:"              echo "An email containing results was sent to the following addresses:"
1748              echo "  \"$ADDRESSES\""              echo "  \"$ADDRESSES\""
1749              echo              echo
1750              test -f $DRESULTS".tar"  &&  rm -f $DRESULTS".tar"              test -f ${SAVDIR}/${DRESULTS}".tar" &&  rm -f ${SAVDIR}/${DRESULTS}".tar"
1751              test -f $DRESULTS".tar.gz"  &&  rm -f $DRESULTS".tar.gz"              test -f ${SAVDIR}/${DRESULTS}".tar.gz" &&  rm -f ${SAVDIR}/${DRESULTS}".tar.gz"
1752          fi          fi
1753      fi      fi
1754  fi  fi
Legend:
Removed from v.1.180  
changed lines
  Added in v.1.192
  ViewVC Help
Powered by ViewVC 1.1.22