/[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.62 by edhill, Tue Jan 25 22:41:05 2005 UTC revision 1.67 by jmc, Sun Feb 6 16:58:08 2005 UTC
# Line 95  testoutput_for_prop() Line 95  testoutput_for_prop()
95      fi      fi
96      if [ -r $1/$4/output.txt ]; then      if [ -r $1/$4/output.txt ]; then
97          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
98          lncnt=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l tmp1.txt | awk '{print $1}' `
99          if [ $lncnt -lt 3 ]; then          if [ $lncntA -lt 3 ]; then
100              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
101                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
102              fi              fi
# Line 110  testoutput_for_prop() Line 110  testoutput_for_prop()
110          echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2          echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2
111      fi      fi
112      grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt
113      lncnt=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l tmp2.txt | awk '{print $1}' `
114      if [ $lncnt -lt 3 ]; then      if [ $lncntB -lt 3 ]; then
115          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
116              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
117          fi          fi
118          return 99          return 99
119      fi      fi
120        if [ $lncntA -ne $lncntB ]; then
121            if [ $verbose -gt 0 ]; then
122                echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2
123            fi
124            return 99
125        fi
126      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
127          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2
128      fi      fi
# Line 294  genmakemodel() Line 300  genmakemodel()
300              if test "x$IEEE" != x ; then              if test "x$IEEE" != x ; then
301                  command="$command -ieee"                  command="$command -ieee"
302              fi              fi
303                if test "x$MPI" = xt ; then
304                    command="$command -mpi"
305                fi
306              printf 'genmake ... ' 1>&2              printf 'genmake ... ' 1>&2
307              $command > make.log 2>&1              $command > make.log 2>&1
308              RETVAL=$?              RETVAL=$?
# Line 529  int main( int argc, char** argv )  { Line 538  int main( int argc, char** argv )  {
538      abave = 0.5*(fabs(a)+fabs(b));      abave = 0.5*(fabs(a)+fabs(b));
539      if (abave > 0.0) {      if (abave > 0.0) {
540        relerr=fabs(a-b)/abave;        relerr=fabs(a-b)/abave;
541        if (relerr > 0.0) { linnum = (int)lrint(log10(relerr)); }        if (relerr > 0.0) { linnum = (int)rint(log10(relerr)); }
542        else { linnum = -16 ; }        else { linnum = -16 ; }
543        best = (best > linnum) ? best : linnum;        best = (best > linnum) ? best : linnum;
544      }      }
# Line 995  for dir in $TESTDIRS ; do Line 1004  for dir in $TESTDIRS ; do
1004              ldir=build              ldir=build
1005              (              (
1006                  cd "$dir/$ldir" > /dev/null 2>&1                  cd "$dir/$ldir" > /dev/null 2>&1
1007                  ls -1 Makefile *.[fFhco]* mitgcmuv  2>/dev/null \                  ls -1 Makefile *.[fFhco] mitgcmuv  2>/dev/null \
1008                      | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'                      | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g'
1009              ) > tr_exrun_links              ) > tr_exrun_links
1010              (              (
# Line 1072  fi Line 1081  fi
1081  rm -f tmp_cmpnum.c tmp_cmpnum  rm -f tmp_cmpnum.c tmp_cmpnum
1082    
1083  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
1084      cat $SUMMARY      cat $SUMMARY | sed 's/ -- -- -- --//g'
1085      if test -e tr_out.txt ; then      if test -e tr_out.txt ; then
1086          mv tr_out.txt tr_out.txt.old          mv tr_out.txt tr_out.txt.old
1087      fi      fi
1088      cat $SUMMARY > tr_out.txt      cat $SUMMARY | sed 's/ -- -- -- --//g' > tr_out.txt
1089  fi  fi
1090    
1091  if test "x$DELDIR" = xt ; then  if test "x$DELDIR" = xt ; then
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.67
  ViewVC Help
Powered by ViewVC 1.1.22