--- MITgcm/verification/testscript	2003/05/19 19:34:27	1.23
+++ MITgcm/verification/testscript	2003/12/03 19:43:51	1.26
@@ -137,13 +137,13 @@
    if [ $quick -eq 0 -o ! -r Makefile ]; then
     printf 'genmake ... ' 1>&2
     if [ $ieee -eq 0 ]; then
-     ../../../tools/genmake -mods=../code > make.log 2>&1
+     ../../../tools/genmake2 -mods=../code > make.log 2>&1
     else
-     ../../../tools/genmake -ieee -mods=../code > make.log 2>&1
+     ../../../tools/genmake2 -ieee -mods=../code > make.log 2>&1
     fi
     if [ $? -ne 0 ]; then
      tail make.log
-     echo genmakemodel: genmake failed 1>&2
+     echo genmakemodel: $genmake failed 1>&2
      return 1
     else
       echo succesful 1>&2
@@ -235,7 +235,7 @@
 # if [ ! -r $2 ]; then
 #  mkdir $2
 # fi
-  ( cd $2; ln -sf ../input/* .)
+  ( cd $2; ln -sf ../input/{eedata,data*,*.bin,POLY3*,pickup*} .)
  fi
 }
 
@@ -375,6 +375,7 @@
 ieee=1
 longtest=1
 expts=''
+genmake=genmake
 
 # Process arguments
 for arg in $@
@@ -412,8 +413,9 @@
 
 createcodelet
 
+date > summary.txt
 if [ $longtest -gt 0 ]; then
-cat << EOF > summary.txt
+cat << EOF >> summary.txt
                 T           S           U           V
 C D M    c        m  s        m  s        m  s        m  s
 n p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .
@@ -422,7 +424,7 @@
 
 EOF
 else
-cat << EOF > summary.txt
+cat << EOF >> summary.txt
               T     S     U     V
 C D M    c                        
 n p a R  g  m  m  m  m  m  m  m  m
@@ -440,7 +442,7 @@
  echo
  echo Experiment: $dir
  echo
- unset genmake makedepend make run
+ unset genmakepass makedepend make run
  if [ $longtest -gt 0 ]; then
   results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'
  else
@@ -457,7 +459,7 @@
   builddir=input
   rundir=input
  fi
- genmakemodel $dir/$builddir && genmake=Y \
+ genmakemodel $dir/$builddir && genmakepass=Y \
  && makecleancompile $dir/$builddir \
  && makedependmodel $dir/$builddir && makedepend=Y \
  && makemodel $dir/$builddir && make=Y \
@@ -466,9 +468,9 @@
  && results=`testoutput $dir $rundir` \
  && makecleanupafter $dir/$builddir
  echo
- formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results
+ formatresults $dir ${genmakepass:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results
  echo
- formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results >> summary.txt
+ formatresults $dir ${genmakepass:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results >> summary.txt
  fi
 done
 
@@ -476,4 +478,5 @@
 
 echo -------------------------------------------------------------------------------
 echo 
+date >> summary.txt
 cat summary.txt