/[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.21 by edhill, Thu Nov 27 16:15:39 2003 UTC revision 1.26 by edhill, Fri Dec 5 14:56:45 2003 UTC
# Line 22  usage() Line 22  usage()
22      echo "  (-b|-bash) STRING        preferred location of a \"bash\" or"      echo "  (-b|-bash) STRING        preferred location of a \"bash\" or"
23      echo "                             Bourne-compatible \"sh\" shell"      echo "                             Bourne-compatible \"sh\" shell"
24      echo "                             (DEF=\"\" for \"bash\")"      echo "                             (DEF=\"\" for \"bash\")"
25        echo "  (-adm|-ad)               perform an adjoint run"
26      echo "  (-command) STRING        command to run"      echo "  (-command) STRING        command to run"
27      echo "                             (DEF=\"make output.txt\")"      echo "                             (DEF=\"make output.txt\")"
28      echo "  (-m|-make) STRING        command to use for \"make\""      echo "  (-m|-make) STRING        command to use for \"make\""
# Line 54  build_mpack() Line 55  build_mpack()
55              HAVE_MPACK=f              HAVE_MPACK=f
56          fi          fi
57          echo -n "building mpack...  "          echo -n "building mpack...  "
58          ( cd $MPACKDIR && ./configure && $MAKE ) > build_mpack.out 2>&1          if test "x$CC" = x ; then
59                export CC=cc
60            fi
61            ( cd $MPACKDIR && ./configure && $MAKE ) > tr_build_mpack.out 2>&1
62          RETVAL=$?          RETVAL=$?
63          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
64              echo              echo
# Line 62  build_mpack() Line 66  build_mpack()
66              echo              echo
67              HAVE_MPACK=f              HAVE_MPACK=f
68          else          else
69                rm -f tr_build_mpack.out
70              HAVE_MPACK=t              HAVE_MPACK=t
71          fi          fi
72      else      else
# Line 70  build_mpack() Line 75  build_mpack()
75      echo "OK"      echo "OK"
76  }  }
77    
 compare_lines()  
 {  
     # use codelet to compare lines  
     if [ $verbose -gt 1 ]; then  
         cat tmp3.txt 1>&2  
     fi  
     return `./a.out < tmp3.txt`  
 }  
   
78  testoutput_for_prop()  testoutput_for_prop()
79  {  {
80      # testoutput_for_prop dir s1 label subdir      # testoutput_for_prop dir s1 label subdir
# Line 120  testoutput_for_prop() Line 116  testoutput_for_prop()
116      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
117          echo testoutput_for_prop: compare_lines 1>&2          echo testoutput_for_prop: compare_lines 1>&2
118      fi      fi
119      compare_lines      if [ $verbose -gt 1 ]; then
120      digits_of_similarity=$?          cat tmp3.txt 1>&2
121        fi
122        echo "-1" >> tmp3.txt
123        # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number
124        cat tmp3.txt | sed -e 's|:||g' > tmp4.txt
125        digits_of_similarity=`./tmp_cmpnum < tmp4.txt`
126      if [ $digits_of_similarity -eq 99 ]; then      if [ $digits_of_similarity -eq 99 ]; then
127          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
128              echo testoutput_for_prop: No comparison was available for \"$2\" 1>&2              echo testoutput_for_prop: No comparison was available for \"$2\" 1>&2
# Line 132  testoutput_for_prop() Line 133  testoutput_for_prop()
133              echo There were $digits_of_similarity decimal places of similarity for \"$2\" 1>&2              echo There were $digits_of_similarity decimal places of similarity for \"$2\" 1>&2
134          fi          fi
135      fi      fi
136      rm tmp1.txt tmp2.txt tmp3.txt      rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt
137            
138      return $digits_of_similarity      return $digits_of_similarity
139  }  }
# Line 152  dashnum() Line 153  dashnum()
153      done      done
154  }  }
155    
156    testoutput_ad()
157    {
158        grep $3 $1/results_ad/output.txt_adm | awk '{print NR " " $5}' > t05.txt
159        grep $3 $1/$2/output.txt_adm | awk '{print NR " " $5}' > t15.txt
160        grep $3 $1/results_ad/output.txt_adm | awk '{print NR " " $6}' > t06.txt
161        grep $3 $1/$2/output.txt_adm | awk '{print NR " " $6}' > t16.txt
162        join t05.txt t15.txt > t5.txt
163        join t06.txt t16.txt > t6.txt
164        echo "-1" >> t5.txt
165        echo "-1" >> t6.txt
166        digits_5=`./tmp_cmpnum < t5.txt`
167        digits_6=`./tmp_cmpnum < t6.txt`
168        dashnum $digits_5 $digits_6
169        rm -f t[01][56].txt t[56].txt
170    }
171    
172  testoutput()  testoutput()
173  {  {
174      # testoutput diretory subdir      # testoutput directory subdir
175      #      #
176      #  test output in "directory"      #  test output in "directory"
177        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; 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
185            testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?
186            testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?
187            testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?
188            testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2; tsd=$?
189            testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$?
190            testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$?
191            testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$?
192            testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2; ssd=$?
193            testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$?
194            testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$?
195            testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$?
196            testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2; usd=$?
197            testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$?
198            testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$?
199            testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$?
200            testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2; vsd=$?
201            dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \
202                $umin $umax $umean $usd $vmin $vmax $vmean $vsd
203        else
204            testoutput_ad $1 $2 "precision_grdchk_result"
205      fi      fi
     testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$?  
     testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$?  
     testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$?  
     testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2; tsd=$?  
     testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$?  
     testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$?  
     testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$?  
     testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2; ssd=$?  
     testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$?  
     testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$?  
     testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$?  
     testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2; usd=$?  
     testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$?  
     testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$?  
     testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$?  
     testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2; vsd=$?  
       
     dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \  
         $umin $umax $umean $usd $vmin $vmax $vmean $vsd  
206  }  }
207    
208  genmakemodel()  genmakemodel()
# Line 195  genmakemodel() Line 214  genmakemodel()
214          GENMAKE2="$BASH ../../../tools/genmake2"          GENMAKE2="$BASH ../../../tools/genmake2"
215          (          (
216              cd $1;              cd $1;
217              command="$GENMAKE2  -ds -m $MAKE --mods=../code"              command="$GENMAKE2  -ds -m $MAKE"
218                if test "x$ADM" = x ; then
219                    command="$command --mods=../code"
220                else
221                    command="$command --mods=../code_ad"
222                    command="$command -adof=../../../tools/adjoint_options/adjoint_staf"
223                fi
224              if test "x$OPTFILE" != xNONE ; then              if test "x$OPTFILE" != xNONE ; then
225                  command="$command --optfile=$OPTFILE"                  command="$command --optfile=$OPTFILE"
226              fi              fi
# Line 276  makemodel() Line 301  makemodel()
301          cd $1;          cd $1;
302          if test -r Makefile ; then          if test -r Makefile ; then
303              printf 'make ... ' 1>&2              printf 'make ... ' 1>&2
304              $MAKE >> make.log 2>&1              if test "x$ADM" = x ; then
305                    $MAKE >> make.log 2>&1
306                else
307                    $MAKE adall >> make.log 2>&1
308                fi
309              RETVAL=$?              RETVAL=$?
310              if test "x$RETVAL" != x0 ; then              if test "x$RETVAL" != x0 ; then
311                  tail make.log                  tail make.log
# Line 298  linkdata() Line 327  linkdata()
327      if test "x$1" = x1 ; then      if test "x$1" = x1 ; then
328          (          (
329              cd $2              cd $2
330              files=`( cd ../input ; ls -1 | grep -v CVS )`              if test "x$ADM" = x ; then
331              for i in $files ; do                  files=`( cd ../input ; ls -1 | grep -v CVS )`
332                  if test ! -d "../input/"$i ; then                  for i in $files ; do
333                      ln -sf "../input/"$i $i                      if test ! -d "../input/"$i ; then
334                  fi                          ln -sf "../input/"$i $i
335              done                      fi
336                    done
337                else
338                    files=`( cd ../input ; ls -1 *.bin | grep -v CVS )`
339                    for i in $files ; do
340                        if test ! -d "../input/"$i ; then
341                            ln -sf "../input/"$i $i
342                        fi
343                    done
344                    files=`( cd ../input_ad ; ls -1 | grep -v CVS )`
345                    for i in $files ; do
346                        if test ! -d "../input_ad/"$i ; then
347                            ln -sf "../input_ad/"$i $i
348                        fi
349                    done
350                fi
351          )          )
352      fi      fi
353  }  }
# Line 312  runmodel() Line 356  runmodel()
356  {  {
357      # runmodel directory      # runmodel directory
358      #      #
359      #  runs "$COMMAND" in "directory"      #  runs "$COMMAND in "directory"
360      #  (where "$COMMAND" is relative to "directory")      #  (where "$COMMAND" is relative to "directory")
361      (      (
362          cd $1          cd $1
# Line 322  runmodel() Line 366  runmodel()
366          RETVAL=$?          RETVAL=$?
367          if test "x$RETVAL" = x0 ; then          if test "x$RETVAL" = x0 ; then
368              echo successful 1>&2              echo successful 1>&2
369              cp output.txt $CDIR"/output.txt"              if test "x$ADM" = x ; then
370                    cp output.txt $CDIR"/output.txt"
371                else
372                    cp output.txt_adm $CDIR"/output.txt_adm"
373                fi
374              return 0              return 0
375          else          else
376              tail run.log              tail run.log
# Line 338  createcodelet() Line 386  createcodelet()
386      # create codelet for comparing model output      # create codelet for comparing model output
387    
388      echo -n "creating the comparison code...  "      echo -n "creating the comparison code...  "
389      cat > tmp_cmpnum.f <<EOFA      cat > tmp_cmpnum.c <<EOF
390        program cmpnum  #include <stdio.h>
391        implicit none  #include <math.h>
392        real*8 a,b,diff  int main( int argc, char** argv )  {
393        integer linnum,best    int linnum,best;
394        best=-16    double a,b,diff;
395    99  read(*,*,end=70,err=60) linnum,a,b    best = -16;
396        diff=0.5*(abs(a)+abs(b))    while( 1 )  {
397  c     print *,a,b,diff,abs(a-b)/diff      scanf("%d", &linnum);
398        if (diff.gt.1.e-12) then      if (linnum == -1)  break;
399          diff=abs(a-b)/diff      scanf("%lf", &a);  scanf("%lf", &b);
400          if (diff.gt.0.) then      diff = 0.5*(fabs(a)+fabs(b));
401  c         print *,int(log10(diff)),diff      if (diff > 1.e-12) {
402            linnum=int(log10(diff))        diff=fabs(a-b)/diff;
403            best=max(best,linnum)        if (diff > 0.0) {
404          endif          linnum = (int)log10(diff);
405        else          best = (best > linnum) ? best : linnum;
406          if (best.eq.-16.and.diff.ne.0.) best=-22        }
407        endif        else {
408        goto 99          if (best == -16 && diff != 0)  best = -22;
409    60  stop 'cmpnum: An error occured reading a,b'        }
410    70  print *,-best      }
411        end    }
412  EOFA    printf("%d\n", -best);
413      return 0;
414    }
415    EOF
416        cc -o tmp_cmpnum tmp_cmpnum.c -lm
417    
418      f77 -o a.out tmp_cmpnum.f      if [ -x ./tmp_cmpnum ]; then
     if [ -x ./a.out ]; then  
419          echo "OK"          echo "OK"
420          return 0          return 0
421      else      else
# Line 457  TESTDIRS= Line 508  TESTDIRS=
508  MPACKDIR="../tools/mpack-1.6"  MPACKDIR="../tools/mpack-1.6"
509  HAVE_MPACK=  HAVE_MPACK=
510  MPACK="$MPACKDIR/mpack"  MPACK="$MPACKDIR/mpack"
511  COMMAND="make output.txt"  COMMAND=
512  MAKE=make  MAKE=make
513  MPI=f  MPI=f
514    
515    ADM=
516    
517  echo -n "parsing options...  "  echo -n "parsing options...  "
518    
519  ac_prev=  ac_prev=
# Line 524  for ac_option ; do Line 577  for ac_option ; do
577    
578          -mpi) MPI=t ;;          -mpi) MPI=t ;;
579    
580            -adm | -ad) ADM=t ;;
581    
582          -ieee) IEEE=true ;;          -ieee) IEEE=true ;;
583          -noieee) IEEE= ;;          -noieee) IEEE= ;;
584    
# Line 559  if test "x$OPTFILE" = xNONE -a "x$MITGCM Line 614  if test "x$OPTFILE" = xNONE -a "x$MITGCM
614      OPTFILE=$MITGCM_OF      OPTFILE=$MITGCM_OF
615  fi  fi
616    
617    if test "x$ADM" = xt -a "x$COMMAND" = x ; then
618        COMMAND="./mitgcmuv_ad > output.txt_adm 2>&1"
619    fi
620    
621    if test "x$COMMAND" = x ; then
622        COMMAND="make output.txt"
623    fi
624    
625  echo "OK"  echo "OK"
626    
627  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
# Line 571  build_mpack Line 634  build_mpack
634  MACH=`hostname`  MACH=`hostname`
635  UNAMEA=`uname -a`  UNAMEA=`uname -a`
636  DATE=`date +%Y%m%d`  DATE=`date +%Y%m%d`
637  BASE=$MACH"_"$DATE"_"  BASE="tr_"$MACH"_"$DATE"_"
638  DNUM=0  DNUM=0
639  DRESULTS="$BASE$DNUM"  DRESULTS="$BASE$DNUM"
640  while test -e $DRESULTS ; do  while test -e $DRESULTS ; do
# Line 616  else Line 679  else
679  fi  fi
680  echo  echo
681  echo >> $SUMMARY  echo >> $SUMMARY
682  cat << EOF | tee -a $SUMMARY  if test "x$ADM" = x ; then
683        cat << EOF | tee -a $SUMMARY
684                  T           S           U           V                  T           S           U           V
685  G D M    c        m  s        m  s        m  s        m  s  G D M    c        m  s        m  s        m  s        m  s
686  E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .  E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .
# Line 624  N n k u  2  i  a  a  d  i  a  a  d  i  a Line 688  N n k u  2  i  a  a  d  i  a  a  d  i  a
688  2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  .  2 d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  .
689    
690  EOF  EOF
691    else
692        echo "ADJOINT=true" >> $SUMMARY
693        echo >> $SUMMARY
694        cat << EOF | tee -a $SUMMARY
695    G D M    C  G
696    E p a R  o  r
697    N n k u  s  a
698    2 d e n  t  d
699    
700    EOF
701    fi
702    
703  #  ...and each test directory...  #  ...and each test directory...
704  for dir in $TESTDIRS ; do  for dir in $TESTDIRS ; do
# Line 641  for dir in $TESTDIRS ; do Line 716  for dir in $TESTDIRS ; do
716    
717      #  Verify that the testdir exists and contains previous      #  Verify that the testdir exists and contains previous
718      #  results in the correct location--or skip this directory!      #  results in the correct location--or skip this directory!
719      if test ! -r $dir"/results/output.txt" ; then      fout=
720          echo "can't read \"$dir/results/output.txt\" -- skipping $dir"      if test "x$ADM" = x ; then
721            fout=$dir"/results/output.txt"
722        else
723            fout=$dir"/results_ad/output.txt_adm"
724        fi
725        if test ! -r $fout ; then
726            echo "can't read \"$fout\" -- skipping $dir"
727          continue          continue
728      fi      fi
729    
# Line 663  for dir in $TESTDIRS ; do Line 744  for dir in $TESTDIRS ; do
744          linkdata $use_seperate_build $dir/$rundir          linkdata $use_seperate_build $dir/$rundir
745      fi      fi
746            
747      CODE_DIR=$dir/code      if test "x$ADM" = x ; then
748            CODE_DIR=$dir/code
749        else
750            CODE_DIR=$dir/code_ad
751        fi
752      BUILD_DIR=$dir/$builddir      BUILD_DIR=$dir/$builddir
753      MPI_FILES="CPP_EEOPTIONS.h_mpi SIZE.h_mpi"      MPI_FILES="CPP_EEOPTIONS.h_mpi SIZE.h_mpi"
754      NOMPI_FILES="CPP_EEOPTIONS.h_nompi SIZE.h_nompi"      NOMPI_FILES="CPP_EEOPTIONS.h_nompi SIZE.h_nompi"
# Line 721  for dir in $TESTDIRS ; do Line 806  for dir in $TESTDIRS ; do
806      fi      fi
807            
808      echo      echo
809      fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`      if test "x$ADM" = x ; then
810            fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
811        else
812            fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
813            fres=$fres"$results   $dir"
814        fi
815      echo      echo
816      echo "$fres" >> $SUMMARY      echo "$fres" >> $SUMMARY
817      echo "fresults='$fres'" > $CDIR"/summary.txt"      echo "fresults='$fres'" > $CDIR"/summary.txt"
# Line 766  else Line 856  else
856      fi      fi
857  fi  fi
858    
859  rm tmp_cmpnum.f a.out  # rm -f tmp_cmpnum.f a.out
860    rm -f tmp_cmpnum.c tmp_cmpnum
861    
862  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
863      cat $SUMMARY      cat $SUMMARY
864      if test -e tr.out ; then      if test -e tr_out.txt ; then
865          mv tr.out tr.out.old          mv tr_out.txt tr_out.txt.old
866      fi      fi
867      cat $SUMMARY > tr.out      cat $SUMMARY > tr_out.txt
868  fi  fi
869    
Legend:
Removed from v.1.21  
changed lines
  Added in v.1.26
  ViewVC Help
Powered by ViewVC 1.1.22