/[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.94 by jmc, Thu Sep 6 22:31:45 2007 UTC revision 1.102 by jmc, Thu Sep 20 03:17:32 2007 UTC
# Line 96  build_mpack() Line 96  build_mpack()
96    
97  testoutput_var()  testoutput_var()
98  {  {
99      # testoutput_var dir s1 label subdir extension      # testoutput_var dir s1 label subdir reference_output
100      #      #
101      #  compares 1 variable output selected from file $dir/$subdir/$OUTPUTFILE      #  compares 1 variable output selected from file $dir/$subdir/$OUTPUTFILE
102      #     with same output from reference file $dir/results/output.$extension      #     with same output from reference file $dir/results/$reference_output
103      #  using search strings s1 and text label      #  using search strings s1 and text label
104    
105      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
# Line 108  testoutput_var() Line 108  testoutput_var()
108      if [ -r $1/$4/$OUTPUTFILE ]; then      if [ -r $1/$4/$OUTPUTFILE ]; then
109          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > tmp1.txt
110          lncntA=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l tmp1.txt | awk '{print $1}' `
111          if [ $lncntA -lt 3 ]; then          if [ $lncntA -lt 2 ]; then
112              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
113                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
114              fi              fi
# Line 119  testoutput_var() Line 119  testoutput_var()
119          return 99          return 99
120      fi      fi
121      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
122          echo testoutput_var: grep "$2" $1/results/output.$5 1>&2          echo testoutput_var: grep "$2" $1/results/$5 1>&2
123      fi      fi
124      grep "$2" $1/results/output.$5 | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/results/$5 | sed 's/.*=//' | cat -n > tmp2.txt
125      lncntB=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l tmp2.txt | awk '{print $1}' `
126      if [ $lncntB -lt 3 ]; then      if [ $lncntB -lt 2 ]; then
127          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
128              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
129          fi          fi
# Line 161  testoutput_var() Line 161  testoutput_var()
161      digits_of_similarity=`./tr_cmpnum < tmp4.txt`      digits_of_similarity=`./tr_cmpnum < tmp4.txt`
162      if [ $digits_of_similarity -eq 99 ]; then      if [ $digits_of_similarity -eq 99 ]; then
163          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
164              echo testoutput_var: No comparison was available for \"$2\" 1>&2              echo testoutput_var: No comparison was available for \"$3\" 1>&2
165          fi          fi
166          digits_of_similarity=99          digits_of_similarity=99
167      else      else
168          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
169              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 \"$3\" 1>&2
170          fi          fi
171      fi      fi
172      rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt      rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt
# Line 232  check_for_add_mon_output() Line 232  check_for_add_mon_output()
232    
233  testoutput_run()  testoutput_run()
234  {  {
235      # testoutput_run directory subdir extension      # testoutput_run directory subdir reference_output
236      #      #
237      #  test output from 1 run in "directory"      #  test output from 1 run in "directory"
238      if test "x$ADM" = x ; then  #   if test "x$ADM" = x ; then
239          # default list of output variables to be checked:          # default list of output variables to be checked:
240          #  1rst : main variable used to decide if it pass or FAIL          #  1rst : main variable used to decide if it pass or FAIL
241          #  others : number of matching digits to be printed in summary.txt          #  others : number of matching digits to be printed in summary.txt
242          listChk=$DEF_CHECK_LIST          listChk=$DEF_CHECK_LIST
         nbDef=`echo $listChk | awk '{print NF-1+3*gsub("+","E")}'`  
243          #  load experiment-specific list from file "tr_checklist" (if it exist)          #  load experiment-specific list from file "tr_checklist" (if it exist)
244          if test -r $1/$2/tr_checklist ; then listChk=`cat $1/$2/tr_checklist` ; fi          if test -r $1/$2/tr_checklist ; then listChk=`cat $1/$2/tr_checklist` ; fi
245          sVar=`echo $listChk | awk '{print $1}'`          sVar=`echo $listChk | awk '{print $1}'`
246          # remove 1rst var and expand the list: + => min max mean s.d          # remove 1rst var and expand the list: + => min max mean s.d
247          listVar=`echo $listChk | awk '{ for(i=2;i<=NF;i++){if (sub("+","",$i)) \          listVar=`echo $listChk | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' \
248              {printf " %s %s %s %s",$i"mn",$i"mx",$i"av",$i"sd"} else {printf " %s",$i} }}'`                                 | sed 's/+//g' | sed "s/^$sVar//"`
249          if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(I)='$listVar'" 1>&2 ; fi          if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(I)='$listVar'" 1>&2 ; fi
250          for ii in 1 2 3 4 5 6 7 8 9 ; do          for ii in 1 2 3 4 5 6 7 8 9 ; do
251            tst=`eval 'echo "$HAVE_PTR0'$ii'"'`            tst=`eval 'echo "$HAVE_PTR0'$ii'"'`
# Line 269  testoutput_run() Line 268  testoutput_run()
268            case $xx in            case $xx in
269             'PS')  if [ $debug -gt 0 ]             'PS')  if [ $debug -gt 0 ]
270                    then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi                    then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi
271                    testoutput_var $1 "cg2d_init_res" "cg2d init. residual" $2 $3; yy=$?                    testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $3; yy=$?
272                    if [ $debug -gt 0 ] ; then echo testoutput_run: cg2dres=$yy 1>&2 ; fi ;;                    if [ $debug -gt 0 ] ; then echo testoutput_run: cg2dres=$yy 1>&2 ; fi ;;
273             'Tmn') testoutput_var $1 "dynstat_theta_min"  "theta minimum"  $2 $3; yy=$? ;;            'Cost') testoutput_var $1 "ADM  precision_derivative_cost" "ADM Cost" $2 $3; yy=$? ;;
274             'Tmx') testoutput_var $1 "dynstat_theta_max"  "theta maximum"  $2 $3; yy=$? ;;            'Grad') testoutput_var $1 "ADM  precision_derivative_grad" "ADM Grad" $2 $3; yy=$? ;;
275             'Tav') testoutput_var $1 "dynstat_theta_mean" "theta mean"     $2 $3; yy=$? ;;             'Tmn') testoutput_var $1 "dynstat_theta_min"  "Theta minimum"  $2 $3; yy=$? ;;
276             'Tsd') testoutput_var $1 "dynstat_theta_sd"   "theta s.d."     $2 $3; yy=$? ;;             'Tmx') testoutput_var $1 "dynstat_theta_max"  "Theta maximum"  $2 $3; yy=$? ;;
277             'Smn') testoutput_var $1 "dynstat_salt_min"  "salt minimum"    $2 $3; yy=$? ;;             'Tav') testoutput_var $1 "dynstat_theta_mean" "Theta mean"     $2 $3; yy=$? ;;
278             'Smx') testoutput_var $1 "dynstat_salt_max"  "salt maximum"    $2 $3; yy=$? ;;             'Tsd') testoutput_var $1 "dynstat_theta_sd"   "Theta Std.Dev"  $2 $3; yy=$? ;;
279             'Sav') testoutput_var $1 "dynstat_salt_mean" "salt mean"       $2 $3; yy=$? ;;             'Smn') testoutput_var $1 "dynstat_salt_min"  "Salt minimum"    $2 $3; yy=$? ;;
280             'Ssd') testoutput_var $1 "dynstat_salt_sd"   "salt s.d."       $2 $3; yy=$? ;;             'Smx') testoutput_var $1 "dynstat_salt_max"  "Salt maximum"    $2 $3; yy=$? ;;
281               'Sav') testoutput_var $1 "dynstat_salt_mean" "Salt mean"       $2 $3; yy=$? ;;
282               'Ssd') testoutput_var $1 "dynstat_salt_sd"   "Salt Std.Dev"    $2 $3; yy=$? ;;
283             'Umn') testoutput_var $1 "dynstat_uvel_min"  "U minimum"       $2 $3; yy=$? ;;             'Umn') testoutput_var $1 "dynstat_uvel_min"  "U minimum"       $2 $3; yy=$? ;;
284             'Umx') testoutput_var $1 "dynstat_uvel_max"  "U maximum"       $2 $3; yy=$? ;;             'Umx') testoutput_var $1 "dynstat_uvel_max"  "U maximum"       $2 $3; yy=$? ;;
285             'Uav') testoutput_var $1 "dynstat_uvel_mean" "U mean"          $2 $3; yy=$? ;;             'Uav') testoutput_var $1 "dynstat_uvel_mean" "U mean"          $2 $3; yy=$? ;;
286             'Usd') testoutput_var $1 "dynstat_uvel_sd"   "U s.d."          $2 $3; yy=$? ;;             'Usd') testoutput_var $1 "dynstat_uvel_sd"   "U Std.Dev"       $2 $3; yy=$? ;;
287             'Vmn') testoutput_var $1 "dynstat_vvel_min"  "V minimum"       $2 $3; yy=$? ;;             'Vmn') testoutput_var $1 "dynstat_vvel_min"  "V minimum"       $2 $3; yy=$? ;;
288             'Vmx') testoutput_var $1 "dynstat_vvel_max"  "V maximum"       $2 $3; yy=$? ;;             'Vmx') testoutput_var $1 "dynstat_vvel_max"  "V maximum"       $2 $3; yy=$? ;;
289             'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean"          $2 $3; yy=$? ;;             'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean"          $2 $3; yy=$? ;;
290             'Vsd') testoutput_var $1 "dynstat_vvel_sd"   "V s.d."          $2 $3; yy=$? ;;             'Vsd') testoutput_var $1 "dynstat_vvel_sd"   "V Std.Dev"       $2 $3; yy=$? ;;
291          'pt1mn'|'pt2mn'|'pt3mn'|'pt4mn'|'pt5mn') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`          'pt1mn'|'pt2mn'|'pt3mn'|'pt4mn'|'pt5mn') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
292             testoutput_var $1 "trcstat_ptracer0"$ii"_min"  "p0"$ii"_min"   $2 $3; yy=$? ;;             testoutput_var $1 "trcstat_ptracer0"$ii"_min"  "p0"$ii"_min"   $2 $3; yy=$? ;;
293          'pt1mx'|'pt2mx'|'pt3mx'|'pt4mx'|'pt5mx') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`          'pt1mx'|'pt2mx'|'pt3mx'|'pt4mx'|'pt5mx') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
# Line 294  testoutput_run() Line 295  testoutput_run()
295          'pt1av'|'pt2av'|'pt3av'|'pt4av'|'pt5av') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`          'pt1av'|'pt2av'|'pt3av'|'pt4av'|'pt5av') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
296             testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $3; yy=$? ;;             testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $3; yy=$? ;;
297          'pt1sd'|'pt2sd'|'pt3sd'|'pt4sd'|'pt5sd') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`          'pt1sd'|'pt2sd'|'pt3sd'|'pt4sd'|'pt5sd') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
298             testoutput_var $1 "trcstat_ptracer0"$ii"_sd"   "p0"$ii"_sd"    $2 $3; yy=$? ;;             testoutput_var $1 "trcstat_ptracer0"$ii"_sd"   "p0"$ii"_StDv"  $2 $3; yy=$? ;;
299             'Qntmn') testoutput_var $1 "extforcing_qnet_min" "Qnet minimum"  $2 $3; yy=$? ;;
300             'Qntmx') testoutput_var $1 "extforcing_qnet_max" "Qnet maximum"  $2 $3; yy=$? ;;
301             'Qntav') testoutput_var $1 "extforcing_qnet_mean" "Qnet mean"    $2 $3; yy=$? ;;
302             'Qntsd') testoutput_var $1 "extforcing_qnet_sd"  "Qnet Std.Dev"  $2 $3; yy=$? ;;
303             'aSImn') testoutput_var $1 "seaice_area_min"   "SIce Area min"   $2 $3; yy=$? ;;
304             'aSImx') testoutput_var $1 "seaice_area_max"   "SIce Area max"   $2 $3; yy=$? ;;
305             'aSIav') testoutput_var $1 "seaice_area_mean"  "SIce Area mean"  $2 $3; yy=$? ;;
306             'aSIsd') testoutput_var $1 "seaice_area_sd"    "SIce Area StDv"  $2 $3; yy=$? ;;
307             'hSImn') testoutput_var $1 "seaice_heff_min"   "SIce Heff min"   $2 $3; yy=$? ;;
308             'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Hell max"   $2 $3; yy=$? ;;
309             'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Hell mean"  $2 $3; yy=$? ;;
310             'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Hell StDv"  $2 $3; yy=$? ;;
311            'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;;
312            'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $3; yy=$? ;;
313            'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $3; yy=$? ;;
314            'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Global"    $2 $3; yy=$? ;;
315            'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South"     $2 $3; yy=$? ;;
316            'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North"     $2 $3; yy=$? ;;
317                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;                *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
318            esac            esac
319            if test $xx = $sVar            if test $xx = $sVar
# Line 304  testoutput_run() Line 323  testoutput_run()
323          done          done
324    
325          nbVar=`echo $listVar | awk '{print NF}'`          nbVar=`echo $listVar | awk '{print NF}'`
326          if [ $nbVar -lt $nbDef ] ; then          if [ $nbVar -lt $LEN_CHECK_LIST ] ; then
327          #-- fill line (up to standard length) with dot:          #-- fill line (up to standard length) with dot:
328            adNul=`expr $nbDef - $nbVar | awk '{for(i=1;i<=$1;i++){print "."}}'`            adNul=`expr $LEN_CHECK_LIST - $nbVar | awk '{for(i=1;i<=$1;i++){print "."}}'`
329            echo $allargs $adNul            echo $allargs $adNul
330          else          else
331            echo $allargs            echo $allargs
332          fi          fi
333    
334      else  #   else
335          testoutput_ad $1 $2 "precision_grdchk_result"  #       testoutput_ad $1 $2 "precision_grdchk_result"
336      fi  #   fi
337  }  }
338    
339  genmakemodel()  genmakemodel()
# Line 586  runmodel() Line 605  runmodel()
605                  RETVAL=8                  RETVAL=8
606                  ENDVAL=-1                  ENDVAL=-1
607          else          else
608              if test $OUTPUTFILE -ot $EXECUTABLE ; then              if test ! -f $OUTPUTFILE -o $OUTPUTFILE -ot $EXECUTABLE ; then
609                  # output do not exist or is older than executable:
610                  rm -f run.log ; touch run.log                  rm -f run.log ; touch run.log
611                  if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi                  if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
612                  ( eval $COMMAND ) >> run.log 2>&1                  ( eval $COMMAND ) >> run.log 2>&1
# Line 637  int main( int argc, char** argv )  { Line 657  int main( int argc, char** argv )  {
657    double a,b,abave,relerr;    double a,b,abave,relerr;
658    best = -22;    best = -22;
659    lncnt = 0;    lncnt = 0;
660    while( 1 & (lncnt+=1) < 999 )  {    while( 1 & ( (lncnt+=1) < 999 ) )  {
661      scanf("%d", &linnum);      scanf("%d", &linnum);
662      if (linnum == -1)  break;      if (linnum == -1)  break;
663      scanf("%lf", &a);  scanf("%lf", &b);      scanf("%lf", &a);  scanf("%lf", &b);
# Line 684  formatresults() Line 704  formatresults()
704      listPrt=$@      listPrt=$@
705      listRes=`echo $listPrt | sed 's/>//' | sed 's/<//'`      listRes=`echo $listPrt | sed 's/>//' | sed 's/<//'`
706      xx=`echo $listPrt | sed 's/.*>//' | sed 's/<.*//' | awk '{print $1}'`      xx=`echo $listPrt | sed 's/.*>//' | sed 's/<.*//' | awk '{print $1}'`
707      printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</'      printf '%3s' $listPrt
708  #   printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/  > / /' | sed 's/  < / /'  #   line below does not work on hp-ux_ia64 : do those substitutions later on
709    #   printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</'
710            
711      if [ $xx = '..' ]; then      if [ $xx = '..' ]; then
712          printf ' N/O '          printf ' N/O '
# Line 709  scandirs() Line 730  scandirs()
730  {  {
731      if [ $# -eq 1 ]; then      if [ $# -eq 1 ]; then
732          for arg in * ; do          for arg in * ; do
733              test -d $arg/$1 && echo $arg              test -f $arg/$1 && echo $arg
734          done          done
735      else      else
736          echo $*          echo $*
# Line 894  if test "x$QUICK" = xt ; then Line 915  if test "x$QUICK" = xt ; then
915      NODEPEND=t      NODEPEND=t
916  fi  fi
917    
918    #- setting for forward or ADM testing
919    if test "x$ADM" = xt ; then
920        code_dir=code_ad
921        input_dirs='input_ad input'
922        ref_outp="output_adm.txt"
923        EXECUTABLE="mitgcmuv_ad"
924    else
925        code_dir=code
926        input_dirs='input'
927        ref_outp="output.txt"
928        EXECUTABLE="mitgcmuv"
929    fi
930    
931  if test "x$TESTDIRS" = x ; then  if test "x$TESTDIRS" = x ; then
932      if test "x$ADM" = xt ; then  #   if test "x$ADM" = xt ; then
933          LIST=`scandirs results_ad`  #       LIST=`scandirs results_ad/$ref_outp`
934      else  #   else
935          LIST=`scandirs results`          LIST=`scandirs results/$ref_outp`
936      fi  #   fi
937  else  else
938      #- expand group of experiments:      #- expand group of experiments:
939      LIST=" "      LIST=" "
# Line 943  if test "x$OPTFILE" = xNONE -a "x$MITGCM Line 977  if test "x$OPTFILE" = xNONE -a "x$MITGCM
977      OPTFILE=$MITGCM_OF      OPTFILE=$MITGCM_OF
978  fi  fi
979    
980  if test "x$ADM" = xt ; then  OUTPUTFILE=$ref_outp
     EXECUTABLE="mitgcmuv_ad"  
     OUTPUTFILE="output_adm.txt"  
 else  
     EXECUTABLE="mitgcmuv"  
     OUTPUTFILE="output.txt"  
 fi  
   
981  if test "x$COMMAND" = x ; then  if test "x$COMMAND" = x ; then
982      COMMAND="./$EXECUTABLE > $OUTPUTFILE"      COMMAND="./$EXECUTABLE > $OUTPUTFILE"
983  fi  fi
# Line 965  echo "OK (COMMAND= $COMMAND )" Line 992  echo "OK (COMMAND= $COMMAND )"
992  #  (use default or load experiment-specific list from file "tr_checklist")  #  (use default or load experiment-specific list from file "tr_checklist")
993  # content : 1rst = main variable used to decide if it pass or FAIL  # content : 1rst = main variable used to decide if it pass or FAIL
994  #         others = number of matching digits to be printed in summary.txt  #         others = number of matching digits to be printed in summary.txt
995  if test "x$ADM" != xt ; then  if test "x$ADM" = x ; then
996      DEF_CHECK_LIST='PS PS T+ S+ U+ V+ pt1+ pt2+ pt3+ pt4+ pt5+'      DEF_CHECK_LIST='PS PS T+ S+ U+ V+ pt1+ pt2+ pt3+ pt4+ pt5+'
997      EMPTY_RESULTS='.. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..'      EMPTY_RESULTS='.. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..'
998      nbDef=`echo $DEF_CHECK_LIST | awk '{print NF-1+3*gsub("+","E")}'`      LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
999      ii=`echo $EMPTY_RESULTS | awk '{print NF}'`      ii=`echo $EMPTY_RESULTS | awk '{print NF}'`
1000      EMPTY_RESULTS=$EMPTY_RESULTS`expr $nbDef - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`      EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`
1001    else
1002        DEF_CHECK_LIST='Cost Cost Grad'
1003        EMPTY_RESULTS='.. ..'
1004        LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
1005  fi  fi
1006    
1007  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
# Line 1064  if test "x$ADM" = x ; then Line 1095  if test "x$ADM" = x ; then
1095  else  else
1096      echo "ADJOINT=true" >> $SUMMARY      echo "ADJOINT=true" >> $SUMMARY
1097      echo >> $SUMMARY      echo >> $SUMMARY
1098        if [ $MATCH_CRIT -lt 10 ] ;
1099        then line_0="default  "$MATCH_CRIT ;
1100        else line_0="default "$MATCH_CRIT ; fi
1101        echo "$line_0" | tee -a $SUMMARY
1102      cat << EOF | tee -a $SUMMARY      cat << EOF | tee -a $SUMMARY
1103  G D M    C  G  G D M    C  G
1104  E p a R  o  r  E p a R  o  r
# Line 1097  for dir in $TESTDIRS ; do Line 1132  for dir in $TESTDIRS ; do
1132      #  results in the correct location--or skip this directory!      #  results in the correct location--or skip this directory!
1133      fout=      fout=
1134      if test "x$ADM" = x ; then      if test "x$ADM" = x ; then
1135          fout=$dir"/results/output.txt"          fout=$dir"/results/"$ref_outp
1136      else      else
1137          fout=$dir"/results_ad/output_adm.txt"          fout=$dir"/results_ad/"$ref_outp
1138      fi      fi
1139      if test ! -r $fout ; then      if test ! -r $fout ; then
1140          echo "can't read \"$fout\" -- skipping $dir"          echo "can't read \"$fout\" -- skipping $dir"
# Line 1114  for dir in $TESTDIRS ; do Line 1149  for dir in $TESTDIRS ; do
1149      builddir="build"      builddir="build"
1150      if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi      if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
1151      rundir="run"      rundir="run"
    #rundir=$builddir  
1152      if test ! -d $dir/$rundir ; then      if test ! -d $dir/$rundir ; then
1153          rundir=$builddir          rundir=$builddir
1154      fi      fi
1155            CODE_DIR=$dir/$code_dir
     if test "x$ADM" = x ; then  
         code_dir=code  
         CODE_DIR=$dir/code  
         input_dirs='input'  
     else  
         code_dir=code_ad  
         CODE_DIR=$dir/code_ad  
         input_dirs='input_ad input'  
     fi  
1156      BUILD_DIR=$dir/$builddir      BUILD_DIR=$dir/$builddir
1157    
1158      if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then      if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then
# Line 1189  for dir in $TESTDIRS ; do Line 1214  for dir in $TESTDIRS ; do
1214              && makemodel $dir/$builddir && make=Y \              && makemodel $dir/$builddir && make=Y \
1215              && linkdata $dir/$rundir $input_dirs \              && linkdata $dir/$rundir $input_dirs \
1216              && runmodel $dir/$rundir && run=Y \              && runmodel $dir/$rundir && run=Y \
1217              && results=`testoutput_run $dir $rundir "txt"`              && results=`testoutput_run $dir $rundir $ref_outp`
1218      fi      fi
1219            
1220      echo      echo
1221      if test "x$ADM" = x ; then  #   if test "x$ADM" = x ; then
1222          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1223          echo          echo
1224          echo "$fres" >> $SUMMARY          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1225          touch $CDIR"/summary.txt"          touch $CDIR"/summary.txt"
1226          echo "fresults='$fres'" >> $CDIR"/summary.txt"          echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"
1227          echo "MACH='$MACH'" >> $CDIR"/summary.txt"          echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1228          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1229          echo "DATE='$DATE'" >> $CDIR"/summary.txt"          echo "DATE='$DATE'" >> $CDIR"/summary.txt"
# Line 1215  for dir in $TESTDIRS ; do Line 1240  for dir in $TESTDIRS ; do
1240              run_clean $dir/tr_run.$ex              run_clean $dir/tr_run.$ex
1241              linkdata $dir/tr_run.$ex input.$ex input              linkdata $dir/tr_run.$ex input.$ex input
1242              runmodel $dir/tr_run.$ex && run=Y \              runmodel $dir/tr_run.$ex && run=Y \
1243                  && results=`testoutput_run $dir tr_run.$ex ${ex}".txt"`                  && results=`testoutput_run $dir tr_run.$ex "output.${ex}.txt"`
             fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`  
1244              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1245              fres="$fres.$ex"              fres="$fres.$ex"
1246              echo              echo
1247              echo "$fres" >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1248              touch $CDIR"/summary.txt"              touch $CDIR"/summary.txt"
1249              echo "fresults='$fres'" >> $CDIR"/summary.txt"              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"
1250              echo "MACH='$MACH'" >> $CDIR"/summary.txt"              echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1251              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1252              echo "DATE='$DATE'" >> $CDIR"/summary.txt"              echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1253              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"
1254              if test "x$POSTCLEAN" = xt ; then              if test "x$POSTCLEAN" = xt ; then
1255                  run_clean $dir/tr_run.$ex                  run_clean $dir/tr_run.$ex
1256              fi              fi
1257          done          done
1258      else  #   else
1259          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}`
1260          fres=$fres"$results   $dir"  #       fres=$fres"$results   $dir"
1261          echo  #       echo
1262          echo "$fres" >> $SUMMARY  #       echo "$fres" >> $SUMMARY
1263          touch $CDIR"/summary.txt"  #       touch $CDIR"/summary.txt"
1264          echo "fresults='$fres'" >> $CDIR"/summary.txt"  #       echo "fresults='$fres'" >> $CDIR"/summary.txt"
1265          echo "MACH='$MACH'" >> $CDIR"/summary.txt"  #       echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1266          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"  #       echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1267          echo "DATE='$DATE'" >> $CDIR"/summary.txt"  #       echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1268          echo "tdir='$dir'" >> $CDIR"/summary.txt"  #       echo "tdir='$dir'" >> $CDIR"/summary.txt"
1269          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \  #   fi
1270        if test "x$ADM" = xt ; then
1271            grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
1272                             >> $CDIR"/summary.txt"                             >> $CDIR"/summary.txt"
1273      fi      fi
1274    
# Line 1291  fi Line 1317  fi
1317  rm -f tr_cmpnum.c tr_cmpnum  rm -f tr_cmpnum.c tr_cmpnum
1318    
1319  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
1320      cat $SUMMARY | sed 's/  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.//'      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'
 #   cat $SUMMARY | sed 's/  \.//g'  
1321      if test -e tr_out.txt ; then      if test -e tr_out.txt ; then
1322          mv tr_out.txt tr_out.txt.old          mv tr_out.txt tr_out.txt.old
1323      fi      fi
1324      cat $SUMMARY | sed 's/  \.//g' > tr_out.txt      cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/  \.//g' > tr_out.txt
1325  fi  fi
1326    
1327  if test "x$DELDIR" = xt ; then  if test "x$DELDIR" = xt ; then
Legend:
Removed from v.1.94  
changed lines
  Added in v.1.102
  ViewVC Help
Powered by ViewVC 1.1.22