/[MITgcm]/MITgcm/verification/testreport

Diff of /MITgcm/verification/testreport

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

-revision 1.127 by jmc,
Thu Jun  4 23:40:53 2009 UTC
+revision 1.135 by jmc,
Thu Mar  4 21:26:27 2010 UTC
 Line 16 
 usage()
      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
      echo "                             (DEF=\"-ieee\")"
      echo "  (-gsl)                   compile with \"-gsl\" flag"
+     echo "  (-ur4|-use_r4)           if allowed, use real*4 type for '_RS' variable"
      echo "  (-of=|-optfile=)STRING   list of optfiles to use"
      echo "  (-a|-addr) STRING        list of email recipients"
      echo "                             (DEF=\"\" no email is sent)"
-Line 43 
 usage()
+Line 44 
 usage()
      echo "                             (DEF=\"12\")"
      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
      echo "  (-clean)                 *ONLY* run \"make CLEAN\""
+     echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
      echo "  (-nogenmake|-ng)         skip the genmake stage"
      echo "  (-noclean|-nc)           skip the \"make clean\" stage"
-Line 104 
 testoutput_var()
+Line 106 
 testoutput_var()
  {
      # testoutput_var dir s1 label subdir reference_output
      #
      #  compares 1 variable output selected from file $dir/$subdir/$OUTPUTFILE
      #     with same output from reference file $dir/results/$reference_output
      #  using search strings s1 and text label
-Line 176 
 testoutput_var()
+Line 178 
 testoutput_var()
          fi
      fi
      rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt
      return $digits_of_similarity
  }
-Line 264 
 testoutput_run()
+Line 266 
 testoutput_run()
             testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $3; 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 $3; yy=$? ;;
-          'Qntmn') testoutput_var $1 "extforcing_qnet_min" "Qnet minimum"  $2 $3; yy=$? ;;
+          'Qntmn') testoutput_var $1 "forcing_qnet_min" "Qnet minimum"  $2 $3; yy=$? ;;
-          'Qntmx') testoutput_var $1 "extforcing_qnet_max" "Qnet maximum"  $2 $3; yy=$? ;;
+          'Qntmx') testoutput_var $1 "forcing_qnet_max" "Qnet maximum"  $2 $3; yy=$? ;;
-          'Qntav') testoutput_var $1 "extforcing_qnet_mean" "Qnet mean"    $2 $3; yy=$? ;;
+          'Qntav') testoutput_var $1 "forcing_qnet_mean" "Qnet mean"       $2 $3; yy=$? ;;
-          'Qntsd') testoutput_var $1 "extforcing_qnet_sd"  "Qnet Std.Dev"  $2 $3; yy=$? ;;
+          'Qntsd') testoutput_var $1 "forcing_qnet_sd"  "Qnet Std.Dev"  $2 $3; yy=$? ;;
           'aSImn') testoutput_var $1 "seaice_area_min"   "SIce Area min"   $2 $3; yy=$? ;;
           'aSImx') testoutput_var $1 "seaice_area_max"   "SIce Area max"   $2 $3; yy=$? ;;
           'aSIav') testoutput_var $1 "seaice_area_mean"  "SIce Area mean"  $2 $3; yy=$? ;;
-Line 291 
 testoutput_run()
+Line 293 
 testoutput_run()
          done
          nbVar=`echo $listVar | awk '{print NF}'`
          if [ $nbVar -lt $LEN_CHECK_LIST ] ; then
          #-- fill line (up to standard length) with dot:
            adNul=`expr $LEN_CHECK_LIST - $nbVar | awk '{for(i=1;i<=$1;i++){print "."}}'`
            echo $allargs $adNul
          else
            echo $allargs
          fi
  # <-- same processing for adjoint & forward test
  }
-Line 338 
 genmakemodel()
+Line 340 
 genmakemodel()
              #- run multi-threaded using OpenMP:
                  command="$command -omp"
              fi
+             if test "x$USE_R4" = xt ; then
+                 command="$command -use_r4"
+             fi
              if test "x$TS" = xt ; then
                  command="$command -ts"
              fi
              if test "x$PAPIS" = xt ; then
                  command="$command -papis"
              else
              if test "x$PCLS" = xt ; then
                  command="$command -pcls"
              fi
-Line 463 
 makemodel()
+Line 468 
 makemodel()
                  tail make.log
                  echo failed 1>&2
                  cp make.log $CDIR"/make.log"
+                 rm -f $EXECUTABLE
                  return 1
              else
                  echo successful 1>&2
-Line 481 
 symlink_mpifiles()
+Line 487 
 symlink_mpifiles()
      code_dir=$2
      BUILD_DIR=$dir/$3
      CODE_DIR=$dir/$code_dir
      # These are files that should replace their counter-part when using -mpi
      MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi" -print)`
-Line 516 
 symlink_mpifiles()
+Line 522 
 symlink_mpifiles()
              fi
          done
      fi
  }
  linkdata()
-Line 535 
 linkdata()
+Line 541 
 linkdata()
                  if test "x$MPI" = "xt" ; then
                  # mpi test: remove symbolic link & link _mpi sfx file
                      if test -h $yy ; then rm -f $yy ; fi
                      if test ! -r $yy ; then
                          ln -sf "../"$1"/"$xx $yy ;
                          printf "$xx " 1>&2
                      fi
-Line 550 
 linkdata()
+Line 556 
 linkdata()
                  if test "x$MULTI_THREAD" = "xt" ; then
                  # multi-threaded test: remove symbolic link & link eedata.mth
                      if test -h eedata ; then rm -f eedata ; fi
                      if test ! -r eedata ; then
                          ln -sf "../"$1"/eedata.mth" eedata ;
                          printf 'eedata.mth ' 1>&2
                      fi
-Line 587 
 runmodel()
+Line 593 
 runmodel()
  {
      # runmodel directory
      #
      #  runs "$COMMAND in "directory"
      #  (where "$COMMAND" is relative to "directory")
      (
          cd $1
          printf 'runmodel in %s ...' $1 1>&2
          # make output.txt
          echo
-         if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
+         if test -L $EXECUTABLE ; then
+           if test -x "../"$builddir"/"$EXECUTABLE ; then
              diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
              outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; fi
+           else rm -f $EXECUTABLE
+           fi
          fi
          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_tmp
-Line 620 
 runmodel()
+Line 629 
 runmodel()
                  if test -f $RUNLOG ; then
                      if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
                      echo "---------->> $OUTPUTFILE is up to date " >> $RUNLOG 2>&1
                  else
                      touch $RUNLOG
                      if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
                      echo "---------->> $OUTPUTFILE is up to date " >> $RUNLOG 2>&1
-Line 630 
 runmodel()
+Line 639 
 runmodel()
              ENDVAL=`cat $RUNLOG | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`
          fi
          rm -f run.log_tmp
-         #if test "x$RETVAL" = x0 ; then
          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
              tail $RUNLOG
              echo successful 1>&2
-Line 638 
 runmodel()
+Line 646 
 runmodel()
              #cp $OUTPUTFILE $CDIR"/"$OUTPUTFILE
              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
              return 0
+         elif [ $RETVAL -ne 0 -a $ENDVAL -gt 0 ] ; then
+             #-- for some weird cases (run is finihed but with error code)
+             tail $RUNLOG
+             echo finished with error '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2
+             return 0
          else
              tail $RUNLOG
              echo failed '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2
-Line 692 
 EOF
+Line 705 
 EOF
          return 0
      else
          echo
          echo "ERROR: failed to compile comparison code -- please specify"
          echo "  a C compiler using the CC environment variable."
          exit 1
      fi
-Line 711 
 formatresults()
+Line 724 
 formatresults()
      printf '%3s' $listPrt
  #   line below does not work on hp-ux_ia64 : do those substitutions later on
  #   printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</'
      if [ $xx = '..' ]; then
          printf ' N/O '
      elif [ $xx = '--' ]; then
-Line 727 
 formatresults()
+Line 740 
 formatresults()
      fi
      printf '  %s' $nm
      printf '\n'
  }
  scandirs()
-Line 786 
 fi
+Line 799 
 fi
  GSL=f
  CLEANUP=f
+ NORUN=f
  QUICK=f
  NOGENMAKE=f
  NOCLEAN=f
-Line 812 
 MPI=f
+Line 826 
 MPI=f
  MULTI_THREAD=f
  OUTDIR=
  DELDIR=
+ USE_R4=
  ADM=
  OADM=
-Line 834 
 for ac_option ; do
+Line 849 
 for ac_option ; do
      fi
      ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
      case $ac_option in
          -help | --help | -h | --h)
-Line 898 
 for ac_option ; do
+Line 913 
 for ac_option ; do
          -clean | --clean)
              CLEANUP=t ; DELDIR=t ;;
+         -norun | --norun | -nr | --nr)
+             NORUN=t ;;
          -quick | --quick | -q | --q)
              QUICK=t ;;
          -nogenmake | --nogenmake | -ng | --ng)
-Line 928 
 for ac_option ; do
+Line 945 
 for ac_option ; do
          -deldir | -dd) DELDIR=t ;;
-         -ts) TS=t;;
+         -ur4|-use_r4) USE_R4=t ;;
+         -ts) TS=t;;
          -papis) PAPIS=t;;
          -pcls) PCL=t;;
          -*)
              echo "Error: unrecognized option: "$ac_option
              usage
              ;;
          *)
              echo "Error: unrecognized argument: "$ac_option
              usage
              ;;
       esac
  done
  if test "x$QUICK" = xt ; then
-Line 988 
 else
+Line 1005 
 else
                   LIST=${LIST}" "`ls | grep 'tutorial_'` ;;
          *)       LIST=${LIST}" "$xx ;;
        esac
      done
  fi
  #echo 'LIST='${LIST}'<'
  #- skip dirs, remove duplicate and non-directory:
-Line 1009 
 do
+Line 1026 
 do
          else count=1 ; echo "" ;  echo -n " skip: \"$xx\""
          fi
      fi
  done
  if test $count = 1 ; then echo "" ; echo -n " ... " ; fi
  #echo 'TESTDIRS='${TESTDIRS}'<'
-Line 1045 
 else
+Line 1062 
 else
  fi
  #  create the FORTRAN comparison code
- createcodelet
+ if test -x tr_cmpnum ; then
+     echo "skipping comparison code build"
+ else
+     createcodelet
+ fi
  #  build the mpack utility (if ADDRESSES = NONE, do it to test the build)
  if test "x$ADDRESSES" = x ; then
-Line 1117 
 fi
+Line 1138 
 fi
  echo
  echo >> $SUMMARY
  if test "x$ADM" = x -a "x$OADM" = x; then
      if [ $MATCH_CRIT -lt 10 ] ;
      then line_0="default  "$MATCH_CRIT ;
      else line_0="default "$MATCH_CRIT ; fi
         line_0="$line_0  ----T-----  ----S-----  ----U-----  ----V-----"
  #   line_0="            ----T-----  ----S-----  ----U-----  ----V-----"
-Line 1142 
 if test "x$ADM" = x -a "x$OADM" = x; the
+Line 1163 
 if test "x$ADM" = x -a "x$OADM" = x; the
  else
      echo "ADJOINT=true" >> $SUMMARY
      echo >> $SUMMARY
      if [ $MATCH_CRIT -lt 10 ] ;
      then line_0="default     "$MATCH_CRIT ;
      else line_0="default    "$MATCH_CRIT ; fi
      echo "$line_0" | tee -a $SUMMARY
      cat << EOF | tee -a $SUMMARY
-Line 1157 
 fi
+Line 1178 
 fi
  #  ...and each test directory...
  for dir in $TESTDIRS ; do
      # set builddir & rundir:
      builddir="build"
      if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
-Line 1172 
 for dir in $TESTDIRS ; do
+Line 1193 
 for dir in $TESTDIRS ; do
      if test "x$CLEANUP" = xt ; then
          echo -n '  --- dir:' $BUILD_DIR ': '
          makeclean $BUILD_DIR
+         rm -f $BUILD_DIR/$EXECUTABLE
          if test -d $dir/$rundir/CVS ; then
              echo -n '  --- dir:' $dir/$rundir ': '
              run_clean $dir/$rundir
-Line 1185 
 for dir in $TESTDIRS ; do
+Line 1207 
 for dir in $TESTDIRS ; do
          continue
      fi
      #  Verify that the testdir exists and contains previous
      #  results in the correct location--or skip this directory!
      fout=$dir"/results/"$ref_outp
      if test ! -r $fout ; then
-Line 1213 
 for dir in $TESTDIRS ; do
+Line 1235 
 for dir in $TESTDIRS ; do
      #  Check whether there are "extra runs" for this testdir
      extra_runs=
-     ex_run_dirs=`( cd $dir ; echo $inputdir.* )`
+     if test "x$NORUN" = xf ; then
+         ex_run_dirs=`( cd $dir ; echo $inputdir.* )`
+     fi
      #echo "ex_run_dirs='$ex_run_dirs'"
      for exd in $ex_run_dirs ; do
          name=`echo $exd | sed -e "s/$inputdir\.//"`
          refExOut=`echo $ref_outp | sed "s/\./.${name}./"`
          outf="$dir/results/$refExOut"
          if test -f $outf -a -r $outf ; then
            if test "x$MULTI_THREAD" = "xt" ; then
              if test -r $dir"/"$exd"/eedata.mth" ; then
                if test "x$MPI" = "xt" ; then
                  retv=`check_eedata $CODE_DIR"/SIZE.h_mpi" $dir"/"$exd"/eedata.mth"`
-Line 1242 
 for dir in $TESTDIRS ; do
+Line 1266 
 for dir in $TESTDIRS ; do
      echo "-------------------------------------------------------------------------------"
      echo
      if test "x$extra_runs" = "x" ; then
         echo "Experiment:  $dir"
      else
         echo "Experiment:  $dir ; extra_runs=$extra_runs"
-Line 1255 
 for dir in $TESTDIRS ; do
+Line 1279 
 for dir in $TESTDIRS ; do
      rel_CDIR=$DRESULTS"/"$dir
      mkdir $rel_CDIR
      CDIR=`pwd`"/$rel_CDIR"
-     if test "x$CLEANUP" = xt ; then
+     if test "x$NORUN" = xt ; then
-         echo '====>>> this is to check that we never go through this part <<< ==='
+             run=N
-         makeclean $dir/$builddir \
+         genmakemodel $dir/$builddir && genmake=Y \
-             && run_clean $dir/$rundir
+             && makeclean $dir/$builddir \
+             && run_clean $dir/$rundir \
+             && symlink_mpifiles $dir $code_dir $builddir \
+             && makedependmodel $dir/$builddir && makedepend=Y \
+             && makemodel $dir/$builddir && make=Y
      else
          genmakemodel $dir/$builddir && genmake=Y \
              && makeclean $dir/$builddir \
-Line 1271 
 for dir in $TESTDIRS ; do
+Line 1299 
 for dir in $TESTDIRS ; do
              && runmodel $dir/$rundir && run=Y \
              && results=`testoutput_run $dir $rundir $ref_outp`
      fi
+     #echo "results='$results'"
      echo
          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
          echo
-Line 1327 
 for dir in $TESTDIRS ; do
+Line 1356 
 for dir in $TESTDIRS ; do
          makeclean $dir/$builddir \
              && run_clean $dir/$rundir
      fi
      echo "-------------------------------------------------------------------------------"
  done
  printf "Start time:  " >> $SUMMARY
-Line 1358 
 else
+Line 1387 
 else
              echo "An email containing results was sent to the following addresses:"
              echo "  \"$ADDRESSES\""
              echo
+             test -f $DRESULTS".tar"  &&  rm -f $DRESULTS".tar"
+             test -f $DRESULTS".tar.gz"  &&  rm -f $DRESULTS".tar.gz"
          fi
-         test -f $DRESULTS".tar"  &&  rm -f $DRESULTS".tar"
-         test -f $DRESULTS".tar.gz"  &&  rm -f $DRESULTS".tar.gz"
      fi
  fi
- rm -f tr_cmpnum.c tr_cmpnum
+ if test "x$QUICK" = xf -a "x$NORUN" = xf ; then
+     rm -f tr_cmpnum.c tr_cmpnum
+ fi
  if test "x$CLEANUP" != xt ; then
      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'

 Legend:



Removed from v.1.127
 


changed lines


 
Added in v.1.135
 Legend:



Removed from v.1.127
 


changed lines


 
Added in v.1.135
-Removed from v.1.127
+Added in v.1.135

	ViewVC Help
Powered by ViewVC 1.1.22