/[MITgcm]/MITgcm/verification/testreport

Diff of /MITgcm/verification/testreport

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

-revision 1.9.2.5 by edhill,
Fri Oct  3 16:03:00 2003 UTC
+revision 1.9.2.6 by edhill,
Fri Oct  3 18:55:29 2003 UTC
 Line 185 
 genmakemodel()
          (
              cd $1;
              printf 'genmake ... ' 1>&2
-             # ../../../tools/genmake -ieee -mods=../code > make.log 2>&1
+             command="$GENMAKE2  -ds -m $MAKE --mods=../code"
-             $GENMAKE2  -ds -m $MAKE --mods=../code "--optfile="$OPTFILE > make.log 2>&1
+             if test "x$OPTFILE" != xNONE ; then
+                 command="$command --optfile=$OPTFILE"
+                 # echo "  command=\"$command\""
+             fi
+             $command > make.log 2>&1
              RETVAL=$?
              for i in gm_state gm_optfile gm_local Makefile ; do
                  if test -r $i ; then
-Line 423 
 NOCLEAN=f
+Line 427 
 NOCLEAN=f
  NODEPEND=f
  BASH=
- OPTFILES=
+ OPTFILE=NONE
  ADDRESSES=
  TESTDIRS=
  MPACKDIR="../tools/mpack-1.6"
-Line 452 
 for ac_option ; do
+Line 456 
 for ac_option ; do
              usage ;;
          -optfile | --optfile | -of | --of)
-             ac_prev=OPTFILES ;;
+             ac_prev=OPTFILE ;;
          -optfile=* | --optfile=* | -of=* | --of=*)
-             OPTFILES=$ac_optarg ;;
+             OPTFILE=$ac_optarg ;;
          -addr | --addr | -a | --a)
              ac_prev=ADDRESSES ;;
-Line 523 
 if test "x$TESTDIRS" = x ; then
+Line 527 
 if test "x$TESTDIRS" = x ; then
      TESTDIRS=`scandirs`
  fi
- if test "x$OPTFILES" = x ; then
+ if test "x$OPTFILE" = xNONE -a "x$MITGCM_OF" != x ; then
-     OPTFILES=$MITGCM_OF
+     OPTFILE=$MITGCM_OF
- fi
- if test "x$OPTFILES" = x ; then
-     echo "Error: please specify an optfile using either the command-line or"
-     echo "  the MITGCM_OF environment variable.  Also, examples are located "
-     echo "  in \$ROOTDIR/tools/build_options"
-     exit 1
  fi
  echo "OK"
-Line 571 
 EOF
+Line 569 
 EOF
  NDIR=0
- #  For each optfile...
+ if test "x$OPTFILE" != xNONE ; then
- for OPTFILE in $OPTFILES ; do
+     if test -r $OPTFILE ; then
+         OPTFILE=`pwd`"/$OPTFILE"
-     OPTFILE=`pwd`"/$OPTFILE"
-     if test ! -r $OPTFILE ; then
-         echo "Error: can't read optfile \"$OPTFILE\""
-         exit 1
      fi
-     echo
+ fi
-     echo "OPTFILE=$OPTFILE" >> $SUMMARY
+ echo
-     echo >> $SUMMARY
+ echo "OPTFILE=$OPTFILE" >> $SUMMARY
+ echo >> $SUMMARY
-     #  ...and each test directory...
-     for dir in $TESTDIRS ; do
-         #  Cleanup only!
+ #  ...and each test directory...
-         if test "x$CLEANUP" = xt ; then
+ for dir in $TESTDIRS ; do
-             if test -r $dir/build/Makefile ; then
-                 ( cd $dir/build ; make CLEAN )
+     #  Cleanup only!
-             fi
+     if test "x$CLEANUP" = xt ; then
-             if test -r $dir/input/Makefile ; then
+         if test -r $dir/build/Makefile ; then
-                 ( cd $dir/input ; make CLEAN )
+             ( cd $dir/build ; make CLEAN )
-             fi
-             continue
          fi
+         if test -r $dir/input/Makefile ; then
-         #  Verify that the testdir exists and contains previous
+             ( cd $dir/input ; make CLEAN )
-         #  results in the correct location--or skip this directory!
-         if test ! -r $dir"/results/output.txt" ; then
-             echo
-             echo "can't read \"$dir/results/output.txt\" -- skipping $dir"
-             echo
-             continue
          fi
+         continue
+     fi
-         echo "-------------------------------------------------------------------------------"
+     #  Verify that the testdir exists and contains previous
+     #  results in the correct location--or skip this directory!
+     if test ! -r $dir"/results/output.txt" ; then
          echo
-         echo "Experiment:  $dir"
+         echo "can't read \"$dir/results/output.txt\" -- skipping $dir"
          echo
-         unset genmake makedepend make run
+         continue
-         results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
+     fi
-         if [ -r $dir/build ]; then
+     echo "-------------------------------------------------------------------------------"
-             seperatebuilddir=1
+     echo
-             builddir=build
+     echo "Experiment:  $dir"
-             rundir=build
+     echo
-             ( cd $dir/build; ln -sf ../input/* . )
+     unset genmake makedepend make run
-         else
+     results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
-             seperatebuilddir=0
-             builddir=input
-             rundir=input
-         fi
-         CODE_DIR=$dir/code
+     if [ -r $dir/build ]; then
-         BUILD_DIR=$dir/$builddir
+         seperatebuilddir=1
-         MPI_FILES="CPP_EEOPTIONS.h_mpi SIZE.h_mpi"
+         builddir=build
-         NOMPI_FILES="CPP_EEOPTIONS.h_nompi SIZE.h_nompi"
+         rundir=build
-         #  Is this an MPI run?
+         ( cd $dir/build; ln -sf ../input/* . )
-         if test "x$MPI" = xt ; then
+     else
-             FILES=$MPI_FILES
+         seperatebuilddir=0
-         else
+         builddir=input
-             FILES=$NOMPI_FILES
+         rundir=input
+     fi
+     CODE_DIR=$dir/code
+     BUILD_DIR=$dir/$builddir
+     MPI_FILES="CPP_EEOPTIONS.h_mpi SIZE.h_mpi"
+     NOMPI_FILES="CPP_EEOPTIONS.h_nompi SIZE.h_nompi"
+     #  Is this an MPI run?
+     if test "x$MPI" = xt ; then
+         FILES=$MPI_FILES
+     else
+         FILES=$NOMPI_FILES
+     fi
+     #  Check to see that we have the files
+     have_files=t
+     for i in $FILES ; do
+         if test ! -r $CODE_DIR/$i ; then
+             echo "Warning: can't read file $CODE_DIR/$i"
+             have_files=f
          fi
+     done
-         #  Check to see that we have the files
+     if test "x$have_files" != xt -a "x$MPI" = xt ; then
-         have_files=t
+         echo "Skipping $dir due to lack of input files (see above warning)"
+         continue
+     fi
+     #  If we have the $FILES and they differ, copy the $FILES to $BUILD_DIR
+     if test "x$have_files" = xt ; then
          for i in $FILES ; do
-             if test ! -r $CODE_DIR/$i ; then
+             cmp $CODE_DIR/$i $BUILD_DIR/$i > /dev/null 2>&1
-                 echo "Warning: can't read file $CODE_DIR/$i" | tee -a $SUMMARY
-                 have_files=f
-             fi
-         done
-         if test "x$have_files" != xt -a "x$MPI" = xt ; then
-             echo "Skipping $dir due to lack of input files (see above warning)" \
-                 | tee -a $SUMMARY
-             continue
-         fi
-         #  If we have the $FILES and they differ, copy the $FILES to $BUILD_DIR
-         if "x$have_files" = xt ; then
-             for i in $FILES ; do
-                 cmp $CODE_DIR/$i $BUILD_DIR/$i > /dev/null 2>&1
-                 RETVAL=$?
-                 if test "x$RETVAL" != x0 ; then
-                     cp $CODE_DIR/$i $BUILD_DIR/$i
-                 fi
-             done
-         fi
-         #  Create an output dir for each OPTFILE/tdir combination
-         CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR
-         mkdir $CDIR
-         CDIR=`pwd`"/$CDIR"
-         if test "x$CLEANUP" = xt ; then
-             makeclean $dir/$builddir
-         else
-             genmakemodel $dir/$builddir && genmake=Y \
-                 && makeclean $dir/$builddir \
-                 && makedependmodel $dir/$builddir && makedepend=Y \
-                 && makemodel $dir/$builddir && make=Y \
-                 && linkdata $seperatebuilddir $dir/$rundir \
-                 && runmodel $dir/$builddir && run=Y \
-                 && results=`testoutput $dir $rundir`
-         fi
-         echo
-         formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
-             ${run:-N} $results
-         echo
-         formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
-             ${run:-N} $results >> $SUMMARY
-         echo "fresults='" > $CDIR"/summary.txt"
-         formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
-             ${run:-N} $results >> $CDIR"/summary.txt"
-         echo "'" >> $CDIR"/summary.txt"
-         echo "MACH='$MACH'" >> $CDIR"/summary.txt"
-         echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
-         echo "DATE='$DATE'" >> $CDIR"/summary.txt"
-         echo "tdir='$dir'" >> $CDIR"/summary.txt"
-         (
-             cd $DRESULTS
-             tar -cf $NDIR".tar" $DRESULTS"_"$NDIR > /dev/null 2>&1
-             gzip $NDIR".tar"
-         )
-         if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
-             echo "No mail sent"
-         else
-             $MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES
              RETVAL=$?
              if test "x$RETVAL" != x0 ; then
-                 echo "Warning: \"$MPACK\" failed -- please contact <edhill@mitgcm.org>"
+                 cp $CODE_DIR/$i $BUILD_DIR/$i
-             else
-                 rm -f $DRESULTS"/"$NDIR".tar*"
              fi
+         done
+     fi
+     #  Create an output dir for each OPTFILE/tdir combination
+     CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR
+     mkdir $CDIR
+     CDIR=`pwd`"/$CDIR"
+     if test "x$CLEANUP" = xt ; then
+         makeclean $dir/$builddir
+     else
+         genmakemodel $dir/$builddir && genmake=Y \
+             && makeclean $dir/$builddir \
+             && makedependmodel $dir/$builddir && makedepend=Y \
+             && makemodel $dir/$builddir && make=Y \
+             && linkdata $seperatebuilddir $dir/$rundir \
+             && runmodel $dir/$builddir && run=Y \
+             && results=`testoutput $dir $rundir`
+     fi
+     echo
+     formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
+         ${run:-N} $results
+     echo
+     formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
+         ${run:-N} $results >> $SUMMARY
+     echo "fresults='" > $CDIR"/summary.txt"
+     formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \
+         ${run:-N} $results >> $CDIR"/summary.txt"
+     echo "'" >> $CDIR"/summary.txt"
+     echo "MACH='$MACH'" >> $CDIR"/summary.txt"
+     echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
+     echo "DATE='$DATE'" >> $CDIR"/summary.txt"
+     echo "tdir='$dir'" >> $CDIR"/summary.txt"
+     (
+         cd $DRESULTS
+         tar -cf $NDIR".tar" $DRESULTS"_"$NDIR > /dev/null 2>&1
+         gzip $NDIR".tar"
+     )
+     if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
+         echo "No mail sent"
+     else
+         $MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES
+         RETVAL=$?
+         if test "x$RETVAL" != x0 ; then
+             echo "Warning: \"$MPACK\" failed -- please contact <edhill@mitgcm.org>"
+         else
+             rm -f $DRESULTS"/"$NDIR".tar*"
          fi
+     fi
-         NDIR=$(( $NDIR + 1 ))
+     NDIR=$(( $NDIR + 1 ))
-     done
  done
  rm tmp_cmpnum.f a.out

 Legend:



Removed from v.1.9.2.5
 


changed lines


 
Added in v.1.9.2.6
 Legend:



Removed from v.1.9.2.5
 


changed lines


 
Added in v.1.9.2.6
-Removed from v.1.9.2.5
+Added in v.1.9.2.6

	ViewVC Help
Powered by ViewVC 1.1.22