/[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.198 by jmc, Tue Nov 11 15:45:57 2014 UTC revision 1.211 by jmc, Wed Jan 11 23:21:21 2017 UTC
# Line 22  usage() Line 22  usage()
22      echo "  (-command|-c) STRING     command to run (e.g., if non-standard MPI setting)"      echo "  (-command|-c) STRING     command to run (e.g., if non-standard MPI setting)"
23      echo "                            DEF='mitgcmuv' or ='mpirun -np TR_NPROC mitgcmuv'"      echo "                            DEF='mitgcmuv' or ='mpirun -np TR_NPROC mitgcmuv'"
24      echo " ---- testing options : ----"      echo " ---- testing options : ----"
25      echo "  (-optfile|-of) STRING    list of optfiles to use"      echo "  (-optfile|-of) STRING    optfile 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)"
# 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)                  use genmake2 option \"-nocat4ad\" (-ncad)"
46        echo "  (-small_f)               make target small_f before making target all"
47      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""
48      echo "  (-make|-m) STRING        command to use for \"make\""      echo "  (-make|-m) STRING        command to use for \"make\""
49      echo "                             (DEF=\"make\")"      echo "                             (DEF=\"make\")"
# Line 61  usage() Line 63  usage()
63      echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"      echo "  (-clean)                 *ONLY* run \"make CLEAN\" & clean run-dir"
64      echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"      echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
65      echo "  (-obj)                   only produces objects (=norun & no executable)"      echo "  (-obj)                   only produces objects (=norun & no executable)"
66        echo "  (-src)                   only produces small '*.f' src files (not even obj)"
67        echo "                            + with: '-adm/-tlm', also makes taf outp src code"
68      echo "  (-runonly|-ro)           *ONLY* run stage (=\"-quick\" without make)"      echo "  (-runonly|-ro)           *ONLY* run stage (=\"-quick\" without make)"
69      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
70      echo "  (-nogenmake|-ng)         skip the genmake stage"      echo "  (-nogenmake|-ng)         skip the genmake stage"
# Line 130  testoutput_var() Line 134  testoutput_var()
134          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2
135      fi      fi
136      if [ -r $1/$4/$OUTPUTFILE ]; then      if [ -r $1/$4/$OUTPUTFILE ]; then
137          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > ${TMP}a.txt          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | nl > ${TMP}a.txt
138          lncntA=`wc -l ${TMP}a.txt | awk '{print $1}' `          lncntA=`wc -l ${TMP}a.txt | awk '{print $1}' `
139          if [ $lncntA -lt 2 ]; then          if [ $lncntA -lt 2 ]; then
140              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
# Line 145  testoutput_var() Line 149  testoutput_var()
149      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
150          echo testoutput_var: grep "$2" $1/$5 1>&2          echo testoutput_var: grep "$2" $1/$5 1>&2
151      fi      fi
152      grep "$2" $1/$5 | sed 's/.*=//' | cat -n > ${TMP}b.txt      grep "$2" $1/$5 | sed 's/.*=//' | nl > ${TMP}b.txt
153      lncntB=`wc -l ${TMP}b.txt | awk '{print $1}' `      lncntB=`wc -l ${TMP}b.txt | awk '{print $1}' `
154      if [ $lncntB -lt 2 ]; then      if [ $lncntB -lt 2 ]; then
155          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
# Line 268  testoutput_run() Line 272  testoutput_run()
272          allargs=""          allargs=""
273          for xx in $listVar          for xx in $listVar
274          do          do
275            case $xx in           #ii=`echo $xx | sed 's/^pt[0-9][0-9]*..$/XXX/'`        #- any ptr number
276              ii=`echo $xx | sed 's/^pt[1-9]..$/XXX/'`              #- 1 to 9 ptr number
277              if test $ii != 'XXX' ; then
278              #- all except ptracer stats:
279                case $xx in
280             'PS')  if [ $debug -gt 0 ]             'PS')  if [ $debug -gt 0 ]
281                    then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi                    then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi
282                    testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $refoutp ; yy=$?                    testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $refoutp ; yy=$?
# Line 295  testoutput_run() Line 303  testoutput_run()
303             'Vmx') testoutput_var $1 "dynstat_vvel_max"  "V maximum"       $2 $refoutp ; yy=$? ;;             'Vmx') testoutput_var $1 "dynstat_vvel_max"  "V maximum"       $2 $refoutp ; yy=$? ;;
304             'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean"          $2 $refoutp ; yy=$? ;;             'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean"          $2 $refoutp ; yy=$? ;;
305             'Vsd') testoutput_var $1 "dynstat_vvel_sd"   "V Std.Dev"       $2 $refoutp ; yy=$? ;;             'Vsd') testoutput_var $1 "dynstat_vvel_sd"   "V Std.Dev"       $2 $refoutp ; yy=$? ;;
         'pt1mn'|'pt2mn'|'pt3mn'|'pt4mn'|'pt5mn') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`  
            testoutput_var $1 "trcstat_ptracer0"$ii"_min"  "p0"$ii"_min"   $2 $refoutp ; yy=$? ;;  
         'pt1mx'|'pt2mx'|'pt3mx'|'pt4mx'|'pt5mx') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`  
            testoutput_var $1 "trcstat_ptracer0"$ii"_max"  "p0"$ii"_max"   $2 $refoutp ; yy=$? ;;  
         'pt1av'|'pt2av'|'pt3av'|'pt4av'|'pt5av') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`  
            testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $refoutp ; yy=$? ;;  
         'pt1sd'|'pt2sd'|'pt3sd'|'pt4sd'|'pt5sd') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`  
            testoutput_var $1 "trcstat_ptracer0"$ii"_sd"   "p0"$ii"_StDv"  $2 $refoutp ; yy=$? ;;  
306           'Qntmn') testoutput_var $1 "forcing_qnet_min" "Qnet minimum"  $2 $refoutp ; yy=$? ;;           'Qntmn') testoutput_var $1 "forcing_qnet_min" "Qnet minimum"  $2 $refoutp ; yy=$? ;;
307           'Qntmx') testoutput_var $1 "forcing_qnet_max" "Qnet maximum"  $2 $refoutp ; yy=$? ;;           'Qntmx') testoutput_var $1 "forcing_qnet_max" "Qnet maximum"  $2 $refoutp ; yy=$? ;;
308           'Qntav') testoutput_var $1 "forcing_qnet_mean" "Qnet mean"       $2 $refoutp ; yy=$? ;;           'Qntav') testoutput_var $1 "forcing_qnet_mean" "Qnet mean"       $2 $refoutp ; yy=$? ;;
# Line 337  testoutput_run() Line 337  testoutput_run()
337           'sboAp') testoutput_var $1 "sbo_zoamp"         "SBO AM-P"        $2 $refoutp ; yy=$? ;;           '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
341              else
342              #- ptracers stats:
343                nn=`echo $xx | sed 's/pt//' | sed 's/..$//'`
344                ii=`echo $xx | sed 's/^pt[0-9]*//'`
345                case $ii in
346                'mn') testoutput_var $1 "trcstat_ptracer0"$nn"_min"  "p0"$nn"_min"  $2 $refoutp ; yy=$? ;;
347                'mx') testoutput_var $1 "trcstat_ptracer0"$nn"_max"  "p0"$nn"_max"  $2 $refoutp ; yy=$? ;;
348                'av') testoutput_var $1 "trcstat_ptracer0"$nn"_mean" "p0"$nn"_mean" $2 $refoutp ; yy=$? ;;
349                'sd') testoutput_var $1 "trcstat_ptracer0"$nn"_sd"   "p0"$nn"_StDv" $2 $refoutp ; yy=$? ;;
350                esac
351              fi
352            if test $xx = $sVar            if test $xx = $sVar
353            then allargs="$allargs > $yy <"            then allargs="$allargs > $yy <"
354            else allargs="$allargs $yy"            else allargs="$allargs $yy"
# Line 402  genmakemodel() Line 413  genmakemodel()
413              if test "x$EXTRFLG" != x ; then              if test "x$EXTRFLG" != x ; then
414                  command="$command -extra_flag $EXTRFLG"                  command="$command -extra_flag $EXTRFLG"
415              fi              fi
416                if test "x$NOCATAD" = xt ; then
417                    command="$command -nocat4ad"
418                fi
419              if test "x$TS" = xt ; then              if test "x$TS" = xt ; then
420                  command="$command -ts"                  command="$command -ts"
421              fi              fi
# Line 523  makemodel() Line 537  makemodel()
537      else      else
538          cd $1;          cd $1;
539          if test -r Makefile ; then          if test -r Makefile ; then
540              printf 'make ... '              if test "x$MKSMALLF" = xt ; then
541              if test "x$REPLMAKE" = x ; then                  printf 'make small_f ... '
542                  $MAKE $TARG >> make.tr_log 2>&1                  $MAKE_CMD small_f >> make.tr_log 2>&1
543              else                  RETVAL=$?
544                  $REPLMAKE $TARG >> make.tr_log 2>&1                  if test "x$RETVAL" != x0 ; then
545                        tail make.tr_log
546                        echo failed
547                        cp genmake.log genmake.tr_log $CDIR
548                        tail -$NBLINES_MKLOG make.tr_log > $CDIR"/make.tr_log_tail"
549                        rm -f $EXECUTABLE
550                        mk_fail=1
551                    else
552                        echo successful
553                    fi
554              fi              fi
555                printf "make $TARG ... "
556                $MAKE_CMD $TARG >> make.tr_log 2>&1
557              RETVAL=$?              RETVAL=$?
558              if test "x$RETVAL" != x0 ; then              if test "x$RETVAL" != x0 ; then
559                  tail make.tr_log                  tail make.tr_log
# Line 776  runmodel() Line 801  runmodel()
801          if test "x$MPI" != x0 ; then          if test "x$MPI" != x0 ; then
802              #- adjust the MPI run command with the right number of Procs              #- adjust the MPI run command with the right number of Procs
803              #echo '' ; echo "  COMMAND='$COMMAND'"              #echo '' ; echo "  COMMAND='$COMMAND'"
804              COMMAND=`echo $COMMAND | sed "s/ TR_NPROC / $LOC_NPROC /"`              COMMAND=`echo $COMMAND | sed "s/ TR_NPROC/ $LOC_NPROC/"`
805              if test "x$MPI_MFILE" != x ; then              if test "x$MPI_MFILE" != x ; then
806                COMMAND=`echo $COMMAND | sed "s/ TR_MFILE / ..\/..\/$LOC_MFILE /"`                COMMAND=`echo $COMMAND | sed "s/ TR_MFILE / ..\/..\/$LOC_MFILE /"`
807              fi              fi
# Line 842  runmodel() Line 867  runmodel()
867          if test -f $OUTPUTFILE ; then          if test -f $OUTPUTFILE ; then
868            grep '(PID\.TID 0000\.0001)      n.. =' $OUTPUTFILE \            grep '(PID\.TID 0000\.0001)      n.. =' $OUTPUTFILE \
869                  | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"                  | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
870            grep -A3 'Seconds in section "ALL' $OUTPUTFILE \  #         grep -A3 'Seconds in section "ALL' $OUTPUTFILE \
871                  | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"  #               | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
872    #         some implementations of grep cannot do contextual searches so we
873    #         replace the above with a sed command
874              cat $OUTPUTFILE | sed -n '/Seconds in section "ALL/{N
875              N
876              N
877              p
878              }' | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
879          fi          fi
880          if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi          if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
881          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
# Line 1044  MKDEPEND= Line 1076  MKDEPEND=
1076  if test "x$MAKE" = x ; then  if test "x$MAKE" = x ; then
1077      MAKE=make      MAKE=make
1078  fi  fi
1079  REPLMAKE=  MAKE_CMD=
1080  if test "x$CC" = x ; then  if test "x$CC" = x ; then
1081      CC=cc      CC=cc
1082  fi  fi
# Line 1057  OUTDIR= Line 1089  OUTDIR=
1089  DELDIR=  DELDIR=
1090  USE_R4=  USE_R4=
1091  EXTRFLG=  EXTRFLG=
1092    NOCATAD=
1093    MKSMALLF=
1094    
1095  #- type of testing (KIND):  #- type of testing (KIND):
1096  #   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 1150  for ac_option ; do
1150          -make | --make | -m | --m) ac_prev=MAKE ;;          -make | --make | -m | --m) ac_prev=MAKE ;;
1151          -make=* | --make=* | -m=* | --m=*) MAKE=$ac_optarg ;;          -make=* | --make=* | -m=* | --m=*) MAKE=$ac_optarg ;;
1152    
1153          -repl_mk | --repl_mk ) ac_prev=REPLMAKE ;;          -repl_mk | --repl_mk ) ac_prev=MAKE_CMD ;;
1154          -repl_mk=* | --repl_mk=*) REPLMAKE=$ac_optarg ;;          -repl_mk=* | --repl_mk=*) MAKE_CMD=$ac_optarg ;;
1155    
1156          -odir | --odir) ac_prev=OUTDIR ;;          -odir | --odir) ac_prev=OUTDIR ;;
1157          -odir=* | --odir=*) OUTDIR=$ac_optarg ;;          -odir=* | --odir=*) OUTDIR=$ac_optarg ;;
# Line 1138  for ac_option ; do Line 1172  for ac_option ; do
1172    
1173          -norun | --norun | -nr | --nr) NORUN=t ;;          -norun | --norun | -nr | --nr) NORUN=t ;;
1174          -obj | --obj ) TARG='obj' ; NORUN=t ;;          -obj | --obj ) TARG='obj' ; NORUN=t ;;
1175            -src | --src ) TARG='small_f' ; NORUN=t ;;
1176          -runonly | --runonly | -ro | --ro) QUICK=t ; NOMAKE=t ;;          -runonly | --runonly | -ro | --ro) QUICK=t ; NOMAKE=t ;;
1177          -quick | --quick | -q | --q) QUICK=t ;;          -quick | --quick | -q | --q) QUICK=t ;;
1178          -nogenmake | --nogenmake | -ng | --ng) NOGENMAKE=t ;;          -nogenmake | --nogenmake | -ng | --ng) NOGENMAKE=t ;;
# Line 1165  for ac_option ; do Line 1200  for ac_option ; do
1200          -oad) if test $KIND = 0 ; then KIND=4 ; NODEPEND=t ; else          -oad) if test $KIND = 0 ; then KIND=4 ; NODEPEND=t ; else
1201                  echo "Error: '-tlm', '-adm' and '-oad' are exclusive" ; usage                  echo "Error: '-tlm', '-adm' and '-oad' are exclusive" ; usage
1202                fi ;;                fi ;;
1203            -ncad) NOCATAD=t ;;
1204            -small_f) MKSMALLF=t ;;
1205    
1206          -ieee)   echo "Warning: ignore option '-ieee' (already the default)"          -ieee)   echo "Warning: ignore option '-ieee' (already the default)"
1207                   printf " ... " ;;                   printf " ... " ;;
# Line 1184  for ac_option ; do Line 1221  for ac_option ; do
1221    
1222          -ts) TS=t;;          -ts) TS=t;;
1223          -papis) PAPIS=t;;          -papis) PAPIS=t;;
1224          -pcls) PCL=t;;          -pcls) PCLS=t;;
1225    
1226          -*) echo "Error: unrecognized option: "$ac_option          -*) echo "Error: unrecognized option: "$ac_option
1227              usage ;;              usage ;;
# Line 1200  if test "x$QUICK" = xt ; then Line 1237  if test "x$QUICK" = xt ; then
1237      NOCLEAN=t      NOCLEAN=t
1238      NODEPEND=t      NODEPEND=t
1239  fi  fi
1240    if test "x$MAKE_CMD" = x ; then MAKE_CMD=$MAKE ; fi
1241    
1242  #- check length of MPI machine file:  #- check length of MPI machine file:
1243  if test "x$MPI" != x0 -a "x$MPI_MFILE" != x ; then  if test "x$MPI" != x0 -a "x$MPI_MFILE" != x ; then
# Line 1220  fi Line 1258  fi
1258    
1259  #- setting for forward or ADM testing  #- setting for forward or ADM testing
1260  if test $KIND = 1 ; then  if test $KIND = 1 ; then
1261      TARG=ftlall      if test "x$TARG" = xsmall_f ; then TARG=ftltaf ; else TARG=ftlall ; fi
1262      code_dir=code_ad      code_dir=code_ad
1263      inputdir=input_ad      inputdir=input_ad
1264      ref_outp="output_tlm.txt"      ref_outp="output_tlm.txt"
1265      EXECUTABLE="mitgcmuv_ftl"      EXECUTABLE="mitgcmuv_ftl"
1266  elif test $KIND = 2 ; then  elif test $KIND = 2 ; then
1267      if test "x$TARG" = xobj ; then TARG=adobj ; else TARG=adall ; fi      if test "x$TARG" = x        ; then TARG=adall ; fi
1268        if test "x$TARG" = xobj     ; then TARG=adobj ; fi
1269        if test "x$TARG" = xsmall_f ; then TARG=adtaf ; fi
1270      code_dir=code_ad      code_dir=code_ad
1271      inputdir=input_ad      inputdir=input_ad
1272      ref_outp="output_adm.txt"      ref_outp="output_adm.txt"
# Line 1238  elif test $KIND = 4 ; then Line 1278  elif test $KIND = 4 ; then
1278      ref_outp="output_oadm.txt"      ref_outp="output_oadm.txt"
1279      EXECUTABLE="mitgcmuv_ad"      EXECUTABLE="mitgcmuv_ad"
1280  else  else
     if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi  
1281      code_dir=code      code_dir=code
1282      inputdir=input      inputdir=input
1283      ref_outp="output.txt"      ref_outp="output.txt"
1284      EXECUTABLE="mitgcmuv"      EXECUTABLE="mitgcmuv"
1285  fi  fi
1286    if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi
1287    
1288  xx=`echo $TESTDIRS | awk '{print $1}'`  xx=`echo $TESTDIRS | awk '{print $1}'`
1289  if test "x$TESTDIRS" = x ; then  if test "x$TESTDIRS" = x ; then
# Line 1290  done Line 1330  done
1330  if test $count = 1 ; then echo "" ; echo -n " ... " ; fi  if test $count = 1 ; then echo "" ; echo -n " ... " ; fi
1331  #echo 'TESTDIRS='${TESTDIRS}'<'  #echo 'TESTDIRS='${TESTDIRS}'<'
1332    
 if test "x$OPTFILE" = xNONE -a "x$MITGCM_OF" != x ; then  
     OPTFILE=$MITGCM_OF  
 fi  
   
1333  LOC_MFILE='tr_mpi_mfile'  LOC_MFILE='tr_mpi_mfile'
1334  RUNLOG="run.tr_log"  RUNLOG="run.tr_log"
1335  if test "x$MPI" = x0 ; then  if test "x$MPI" = x0 ; then
# Line 1301  if test "x$MPI" = x0 ; then Line 1337  if test "x$MPI" = x0 ; then
1337    if test "x$COMMAND" = x ; then COMMAND="./$EXECUTABLE > $OUTPUTFILE" ; fi    if test "x$COMMAND" = x ; then COMMAND="./$EXECUTABLE > $OUTPUTFILE" ; fi
1338  else  else
1339    OUTPUTFILE="STDOUT.0000"    OUTPUTFILE="STDOUT.0000"
1340    if test "x$COMMAND" = x ; then COMMAND="mpirun -v -np TR_NPROC ./$EXECUTABLE" ; fi    if test "x$COMMAND" = x ; then COMMAND="mpirun -np TR_NPROC ./$EXECUTABLE" ; fi
1341  fi  fi
1342    
1343  echo "OK (COMMAND='$COMMAND')"  echo "OK (COMMAND='$COMMAND')"
1344    
1345  TMP=./tr_$$  #TMP=./tr_$$
1346  #- try to put temporary files in system-local /tmp dir  #- try to put temporary files in system-local /tmp dir
1347  #TMP=/tmp/tr_$$  TMP=/tmp/tr_${USER}_$$
1348  #touch $TMP ; retVal=$?  touch $TMP ; retVal=$?
1349  #if [ $retVal -eq 0 ] ; then  if [ $retVal -eq 0 ] ; then
1350  #  if test ! -r $TMP ; then TMP=./tr_$$ ; fi    if test ! -r $TMP ; then TMP=./tr_$$ ; fi
1351  #else  else
1352  #  TMP=./tr_$$    TMP=./tr_$$
1353  #fi  fi
1354  #rm -f $TMP  rm -f $TMP
1355  #if [ $verbose -gt 1 ]; then echo " temp files: $TMP" ; fi  if [ $verbose -gt 1 ]; then echo " temp files: $TMP" ; fi
1356    
1357  # set the Default List of output variables to be checked:  # set the Default List of output variables to be checked:
1358  #  (use default or load experiment-specific list from file "tr_checklist")  #  (use default or load experiment-specific list from file "tr_checklist")
# Line 1370  BASE="tr_"$MACH"_"$DATE"_" Line 1406  BASE="tr_"$MACH"_"$DATE"_"
1406  if test "x$OUTDIR" != x ; then  if test "x$OUTDIR" != x ; then
1407      BASE="tr_"$OUTDIR"_"$DATE"_"      BASE="tr_"$OUTDIR"_"$DATE"_"
1408  else  else
1409     #short_name=`hostname | sed 's/\..*$//'`     #short_name=`hostname -s | tr '[:upper:]' '[:lower:]'`
1410      short_name=`hostname -s | tr '[:upper:]' '[:lower:]'`     # hostname -s is not universal (does work on AIX system)
1411        short_name=`hostname | sed 's/\..*$//' | tr '[:upper:]' '[:lower:]'`
1412      BASE="tr_"$short_name"_"$DATE"_"      BASE="tr_"$short_name"_"$DATE"_"
1413  fi  fi
1414  DNUM=0  DNUM=0
# Line 1628  for dir in $TESTDIRS ; do Line 1665  for dir in $TESTDIRS ; do
1665              && symlink_mpifiles $dir $code_dir $builddir \              && symlink_mpifiles $dir $code_dir $builddir \
1666              && makedependmodel $dir/$builddir && makedepend=Y \              && makedependmodel $dir/$builddir && makedepend=Y \
1667              && makemodel $dir/$builddir && make=Y              && makemodel $dir/$builddir && make=Y
1668                echo
1669      else      else
1670          genmakemodel $dir/$builddir && genmake=Y \          genmakemodel $dir/$builddir && genmake=Y \
1671              && makeclean $dir/$builddir \              && makeclean $dir/$builddir \
# Line 1638  for dir in $TESTDIRS ; do Line 1676  for dir in $TESTDIRS ; do
1676              && linkdata $dir/$rundir $inputdir \              && linkdata $dir/$rundir $inputdir \
1677              && runmodel $dir/$rundir && run=Y \              && runmodel $dir/$rundir && run=Y \
1678              && results=`testoutput_run $dir $rundir $ref_outp`              && results=`testoutput_run $dir $rundir $ref_outp`
1679                echo 1>&2
1680      fi      fi
1681      #echo "results='$results'"      #echo "results='$results'"
1682    
1683          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
         echo 1>&2  
1684          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1685          echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"          echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"
1686    
# Line 1664  for dir in $TESTDIRS ; do Line 1702  for dir in $TESTDIRS ; do
1702              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir
1703              runmodel $dir/$pfxdir.$ex && run=Y \              runmodel $dir/$pfxdir.$ex && run=Y \
1704              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`
             fres=`formatresults $dir.$ex ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`  
1705              echo 1>&2              echo 1>&2
1706    
1707                fres=`formatresults $dir.$ex ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1708              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1709              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"
1710              if test "x$POSTCLEAN" = x2 ; then              if test "x$POSTCLEAN" = x2 ; then
# Line 1677  for dir in $TESTDIRS ; do Line 1716  for dir in $TESTDIRS ; do
1716          if test -f $dir/$builddir/Makefile ; then          if test -f $dir/$builddir/Makefile ; then
1717              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/^# //'`
1718              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
1719              sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state  #           sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
1720    # bsd-sed cannot do the above code
1721                cat $dir/$builddir/Makefile | \
1722                    sed -n '/^# executed by:/{N
1723                                              p
1724                                              }' >> $DRESULTS/genmake_state
1725              echo " $mkOpt" >> $DRESULTS/genmake_state              echo " $mkOpt" >> $DRESULTS/genmake_state
1726              if test "x$OPTFILE" = xNONE ; then              if test "x$OPTFILE" = xNONE ; then
1727                  eval $mkOpt                  eval $mkOpt
1728                  sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\  #               sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\
1729                          $SUMMARY > tmp.tr_log  #                       $SUMMARY > tmp.tr_log
1730    # bsd-sed requires a newline after "a\":
1731                    sed "/^No \"OPTFILE\" was specified ; genmake2/a\\
1732                             OPTFILE=${OPTFILE}" $SUMMARY > tmp.tr_log
1733                  RETVAL=$?                  RETVAL=$?
1734                  if test "x$RETVAL" = x0 ; then                  if test "x$RETVAL" = x0 ; then
1735                      cp -f tmp.tr_log $SUMMARY                      cp -f tmp.tr_log $SUMMARY
# Line 1703  for dir in $TESTDIRS ; do Line 1750  for dir in $TESTDIRS ; do
1750                                           >> $DRESULTS/genmake_state                                           >> $DRESULTS/genmake_state
1751                    rm -f tmp.tr_log                    rm -f tmp.tr_log
1752                  fi                  fi
1753                  echo -n "from '$gmkLog', " >> $DRESULTS/genmake_state              fi
1754                  echo "get NETCDF & LAPACK settings:" >> $DRESULTS/genmake_state              gmkLog=$dir/$builddir/genmake_state
1755                  sed -n '/set HAVE_NETCDF=/p' $gmkLog >> $DRESULTS/genmake_state              if test -r $gmkLog ; then
1756                  sed -n '/set HAVE_LAPACK=/p' $gmkLog >> $DRESULTS/genmake_state                  echo -n "from '$gmkLog', "      >> $DRESULTS/genmake_state
1757                    echo "get genmake settings:"    >> $DRESULTS/genmake_state
1758                    sed -n '/^HAVE_/p' $gmkLog | sed 's/^./ &/' \
1759                                                    >> $DRESULTS/genmake_state
1760              fi              fi
1761          fi          fi
1762      fi      fi
Legend:
Removed from v.1.198  
changed lines
  Added in v.1.211
  ViewVC Help
Powered by ViewVC 1.1.22