/[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.30 by edhill, Fri Dec 5 17:46:32 2003 UTC revision 1.36 by edhill, Fri Mar 12 16:50:42 2004 UTC
# Line 44  usage() Line 44  usage()
44  #  build the mpack utility  #  build the mpack utility
45  build_mpack()  build_mpack()
46  {  {
47      echo -n "building the mpack utility...  "      printf "building the mpack utility...  "
48      if test ! -x "$MPACKDIR/mpack" ; then      if test ! -x "$MPACKDIR/mpack" ; then
49          if test ! -d $MPACKDIR ; then          if test ! -d $MPACKDIR ; then
50              echo              echo
# Line 54  build_mpack() Line 54  build_mpack()
54              echo              echo
55              HAVE_MPACK=f              HAVE_MPACK=f
56          fi          fi
57          echo -n "building mpack...  "          printf "building mpack...  "
58          if test "x$CC" = x ; then          if test "x$CC" = x ; then
59              export CC=cc              export CC=cc
60          fi          fi
# Line 77  build_mpack() Line 77  build_mpack()
77    
78  testoutput_for_prop()  testoutput_for_prop()
79  {  {
80      # testoutput_for_prop dir s1 label subdir      # testoutput_for_prop dir s1 label subdir extension
81      #      #
82      #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt      #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt
83      #  using search strings s1 and text label      #  using search strings s1 and text label
# Line 99  testoutput_for_prop() Line 99  testoutput_for_prop()
99          return 99          return 99
100      fi      fi
101      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
102          echo testoutput_for_prop: grep "$2" $1/results/output.txt 1>&2          echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2
103      fi      fi
104      grep "$2" $1/results/output.txt | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt
105      lncnt=`wc -l tmp2.txt | awk '{print $1}' `      lncnt=`wc -l tmp2.txt | awk '{print $1}' `
106      if [ $lncnt -lt 3 ]; then      if [ $lncnt -lt 3 ]; then
107          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
# Line 171  testoutput_ad() Line 171  testoutput_ad()
171    
172  testoutput()  testoutput()
173  {  {
174      # testoutput directory subdir      # testoutput directory subdir extension
175      #      #
176      #  test output in "directory"      #  test output in "directory"
177      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
178          if [ $debug -gt 0 ]; then          if [ $debug -gt 0 ]; then
179              echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2              echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2
180          fi          fi
181          testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2; cg2dres=$?          testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2 $3; cg2dres=$?
182          if [ $debug -gt 0 ]; then          if [ $debug -gt 0 ]; then
183              echo testoutput: cg2dres=$cg2dres 1>&2              echo testoutput: cg2dres=$cg2dres 1>&2
184          fi          fi
185          testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?          testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2 $3; tmin=$?
186          testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?          testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2 $3; tmax=$?
187          testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?          testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2 $3; tmean=$?
188          testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2; tsd=$?          testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2 $3; tsd=$?
189          testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$?          testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2 $3; smin=$?
190          testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$?          testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2 $3; smax=$?
191          testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$?          testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2 $3; smean=$?
192          testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2; ssd=$?          testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2 $3; ssd=$?
193          testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$?          testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2 $3; umin=$?
194          testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$?          testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2 $3; umax=$?
195          testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$?          testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2 $3; umean=$?
196          testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2; usd=$?          testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2 $3; usd=$?
197          testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$?          testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2 $3; vmin=$?
198          testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$?          testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2 $3; vmax=$?
199          testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$?          testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2 $3; vmean=$?
200          testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2; vsd=$?          testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2 $3; vsd=$?
201          dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \          dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \
202              $umin $umax $umean $usd $vmin $vmax $vmean $vsd              $umin $umax $umean $usd $vmin $vmax $vmean $vsd
203      else      else
# Line 211  genmakemodel() Line 211  genmakemodel()
211      if test "x$NOGENMAKE" = xt ; then      if test "x$NOGENMAKE" = xt ; then
212          echo "genmake skipped!"          echo "genmake skipped!"
213      else      else
214          GENMAKE2="$BASH ../../../tools/genmake2"          if test "x$BASH" = x ; then
215                GENMAKE2="../../../tools/genmake2"
216            else
217                GENMAKE2="$BASH ../../../tools/genmake2 -bash $BASH"
218            fi
219          (          (
220              cd $1;              cd $1;
221              command="$GENMAKE2  -ds -m $MAKE"              command="$GENMAKE2  -ds -m $MAKE"
# Line 432  createcodelet() Line 436  createcodelet()
436  {  {
437      # create codelet for comparing model output      # create codelet for comparing model output
438    
439      echo -n "creating the comparison code...  "      printf "creating the comparison code...  "
440      cat > tmp_cmpnum.c <<EOF      cat > tmp_cmpnum.c <<EOF
441  #include <stdio.h>  #include <stdio.h>
442  #include <math.h>  #include <math.h>
443  int main( int argc, char** argv )  {  int main( int argc, char** argv )  {
444    int linnum,best;    int linnum,best,lncnt;
445    double a,b,diff;    double a,b,diff;
446    best = -16;    best = -16;
447    while( 1 )  {    lncnt = 0;
448      while( 1 & (lncnt+=1) < 999 )  {
449      scanf("%d", &linnum);      scanf("%d", &linnum);
450      if (linnum == -1)  break;      if (linnum == -1)  break;
451      scanf("%lf", &a);  scanf("%lf", &b);      scanf("%lf", &a);  scanf("%lf", &b);
# Line 456  int main( int argc, char** argv )  { Line 461  int main( int argc, char** argv )  {
461        }        }
462      }      }
463    }    }
464      if (lncnt == 999) best=-29;
465    printf("%d\n", -best);    printf("%d\n", -best);
466    return 0;    return 0;
467  }  }
# Line 561  MPI=f Line 567  MPI=f
567    
568  ADM=  ADM=
569    
570  echo -n "parsing options...  "  printf "parsing options...  "
571    
572  ac_prev=  ac_prev=
573  for ac_option ; do  for ac_option ; do
# Line 675  echo "OK" Line 681  echo "OK"
681  createcodelet  createcodelet
682    
683  #  build the mpack utility  #  build the mpack utility
684  build_mpack  if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then
685        echo "skipping mpack build"
686    else
687        build_mpack
688    fi
689    
690  #  Create a uniquely named directory to store results  #  Create a uniquely named directory to store results
691  MACH=`hostname`  MACH=`hostname`
# Line 695  if test "x$RETVAL" != x0 ; then Line 705  if test "x$RETVAL" != x0 ; then
705      exit 1      exit 1
706  fi  fi
707  SUMMARY="$DRESULTS/summary.txt"  SUMMARY="$DRESULTS/summary.txt"
708  echo -n "Start time:  " >> $SUMMARY  printf "Start time:  " >> $SUMMARY
709  start_date=`date`  start_date=`date`
710  echo $start_date > $SUMMARY  echo $start_date > $SUMMARY
711    
# Line 784  for dir in $TESTDIRS ; do Line 794  for dir in $TESTDIRS ; do
794          linkdata $use_seperate_build $dir/$rundir          linkdata $use_seperate_build $dir/$rundir
795      fi      fi
796            
797        #  Check whether there are "extra runs" for this testdir
798        extra_runs=
799        if test "x$ADM" = x -a "x$use_seperate_build" = x1 ; then
800            ex_run_dirs=`( cd $dir ; echo input.* )`
801            echo "ex_run_dirs='$ex_run_dirs'"
802            for exd in $ex_run_dirs ; do
803                name=`echo $exd | sed -e 's/input.//g'`
804                outf="$dir/results/output.txt.$name"
805                if test -f $outf -a -r $outf ; then
806                    extra_runs="$extra_runs $name"
807                fi
808            done
809        fi
810    
811      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
812          code_dir=code          code_dir=code
813          CODE_DIR=$dir/code          CODE_DIR=$dir/code
# Line 826  for dir in $TESTDIRS ; do Line 850  for dir in $TESTDIRS ; do
850      echo      echo
851      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
852          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
853            echo
854            echo "$fres" >> $SUMMARY
855            echo "fresults='$fres'" > $CDIR"/summary.txt"
856            echo "MACH='$MACH'" >> $CDIR"/summary.txt"
857            echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
858            echo "DATE='$DATE'" >> $CDIR"/summary.txt"
859            echo "tdir='$dir'" >> $CDIR"/summary.txt"
860    
861            OLD_COMMAND=$COMMAND
862            COMMAND="./mitgcmuv > output.txt"
863            for ex in $extra_runs ; do
864                test -e "$dir/tr_run" && rm -rf "$dir/tr_run"
865                mkdir "$dir/tr_run"
866                links=`( cd "$dir/input" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
867                (
868                    cd "$dir/tr_run"
869                    for i in $links; do
870                        ln -s ../input/$i $i
871                    done
872                )
873                links=`( cd "$dir/input.$ex" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
874                (
875                    cd "$dir/tr_run"
876                    for i in $links; do
877                        test -e $i  &&  rm -f $i
878                        ln -s ../input.$ex/$i $i
879                    done
880                    ln -s ../$builddir/mitgcmuv mitgcmuv
881                )
882                runmodel $dir/tr_run && run=Y \
883                    && results=`testoutput $dir $rundir "."$ex`
884                fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
885                fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
886                fres="$fres.$ex"
887                echo
888                echo "$fres" >> $SUMMARY
889                echo "fresults='$fres'" > $CDIR"/summary.txt"
890                echo "MACH='$MACH'" >> $CDIR"/summary.txt"
891                echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
892                echo "DATE='$DATE'" >> $CDIR"/summary.txt"
893                echo "tdir='$dir'" >> $CDIR"/summary.txt"
894            done
895            COMMAND=$OLD_COMMAND
896      else      else
897          fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`          fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
898          fres=$fres"$results   $dir"          fres=$fres"$results   $dir"
899            echo
900            echo "$fres" >> $SUMMARY
901            echo "fresults='$fres'" > $CDIR"/summary.txt"
902            echo "MACH='$MACH'" >> $CDIR"/summary.txt"
903            echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
904            echo "DATE='$DATE'" >> $CDIR"/summary.txt"
905            echo "tdir='$dir'" >> $CDIR"/summary.txt"
906      fi      fi
     echo  
     echo "$fres" >> $SUMMARY  
     echo "fresults='$fres'" > $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"  
907            
908      echo "-------------------------------------------------------------------------------"      echo "-------------------------------------------------------------------------------"
909            
910  done  done
911    
912  echo -n "Start time:  " >> $SUMMARY  printf "Start time:  " >> $SUMMARY
913  echo $start_date >> $SUMMARY  echo $start_date >> $SUMMARY
914  echo -n "End time:    " >> $SUMMARY  printf "End time:    " >> $SUMMARY
915  date >> $SUMMARY  date >> $SUMMARY
916    
917  #  If addresses were supplied and mpack built successfully, then try  #  If addresses were supplied and mpack built successfully, then try
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.36
  ViewVC Help
Powered by ViewVC 1.1.22