/[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.104 by jmc, Tue Oct 2 14:24:42 2007 UTC revision 1.107 by jmc, Mon Oct 29 19:14:12 2007 UTC
# Line 414  run_clean() Line 414  run_clean()
414              find . -type l -exec rm {} \;              find . -type l -exec rm {} \;
415              rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime              rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime
416              rm -rf mnc_test_*              rm -rf mnc_test_*
417                rm -f *_MIT_CE_000.opt0000 costfunction*0000
418              echo successful 1>&2              echo successful 1>&2
419              exit 0              exit 0
420          )          )
# Line 575  runmodel() Line 576  runmodel()
576          printf 'runmodel in %s ...' $1 1>&2          printf 'runmodel in %s ...' $1 1>&2
577          # make output.txt          # make output.txt
578          echo          echo
579            if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
580                diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
581                outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi
582            fi
583          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
584              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
585              ln -sf "../"$builddir"/"$EXECUTABLE .              ln -sf "../"$builddir"/"$EXECUTABLE .
# Line 1087  fi Line 1092  fi
1092  #  ...and each test directory...  #  ...and each test directory...
1093  for dir in $TESTDIRS ; do  for dir in $TESTDIRS ; do
1094            
1095        # set builddir & rundir:
1096        builddir="build"
1097        if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
1098        rundir="run"
1099        if test ! -d $dir/$rundir ; then
1100            rundir=$builddir
1101        fi
1102        CODE_DIR=$dir/$code_dir
1103        BUILD_DIR=$dir/$builddir
1104    
1105      #  Cleanup only!      #  Cleanup only!
1106      if test "x$CLEANUP" = xt ; then      if test "x$CLEANUP" = xt ; then
1107          if test -r $dir/build/Makefile ; then          if test -r $BUILD_DIR/Makefile ; then
1108              echo '  ------  clean dir:' $dir/build              echo '  ------  clean dir:' $dir/build
1109              ( cd $dir/build ; make CLEAN )              ( cd $BUILD_DIR ; make CLEAN )
1110          fi          fi
1111          if test -d $dir/run/CVS ; then          if test -d $dir/$rundir/CVS ; then
1112              echo '  ------  clean dir:' $dir/run              echo '  ------  clean dir:' $dir/$rundir
1113              run_clean $dir/run              run_clean $dir/$rundir
1114          fi          fi
1115          (          (
1116              cd $dir              cd $dir
# Line 1117  for dir in $TESTDIRS ; do Line 1132  for dir in $TESTDIRS ; do
1132    
1133      # Check for additional types of monitor output      # Check for additional types of monitor output
1134    
     builddir="build"  
     if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi  
     rundir="run"  
     if test ! -d $dir/$rundir ; then  
         rundir=$builddir  
     fi  
     CODE_DIR=$dir/$code_dir  
     BUILD_DIR=$dir/$builddir  
   
1135      if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then      if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then
1136          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
1137          continue          continue
# Line 1203  for dir in $TESTDIRS ; do Line 1209  for dir in $TESTDIRS ; do
1209          for ex in $extra_runs ; do          for ex in $extra_runs ; do
1210              unset run              unset run
1211              results=$EMPTY_RESULTS              results=$EMPTY_RESULTS
1212                #  reference output file
1213                refExOut=`echo $ref_outp | sed "s/\./.${ex}./g"`
1214              #  Create an output dir for each OPTFILE/tdir.ex combination              #  Create an output dir for each OPTFILE/tdir.ex combination
1215              rel_CDIR=$DRESULTS"/"$dir"."$ex              rel_CDIR=$DRESULTS"/"$dir"."$ex
1216              mkdir $rel_CDIR              mkdir $rel_CDIR
1217              CDIR=`pwd`"/$rel_CDIR"              CDIR=`pwd`"/$rel_CDIR"
1218              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
1219              run_clean $dir/tr_run.$ex              run_clean $dir/tr_run.$ex
1220              linkdata $dir/tr_run.$ex input.$ex input              linkdata $dir/tr_run.$ex input.$ex input
1221              runmodel $dir/tr_run.$ex && run=Y \              runmodel $dir/tr_run.$ex && run=Y \
1222                  && results=`testoutput_run $dir tr_run.$ex "output.${ex}.txt"`              && results=`testoutput_run $dir tr_run.$ex $refExOut`
1223              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1224              fres="$fres.$ex"              fres="$fres.$ex"
1225              echo              echo
# Line 1228  for dir in $TESTDIRS ; do Line 1236  for dir in $TESTDIRS ; do
1236          done          done
1237  # <-- same processing for adjoint & forward test  # <-- same processing for adjoint & forward test
1238      if test "x$ADM" = xt ; then      if test "x$ADM" = xt ; then
1239            head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt"
1240          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
1241                             >> $CDIR"/summary.txt"                             >> $CDIR"/summary.txt"
1242      fi      fi
Legend:
Removed from v.1.104  
changed lines
  Added in v.1.107
  ViewVC Help
Powered by ViewVC 1.1.22