/[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.86 by jmc, Sun Jul 16 04:02:49 2006 UTC revision 1.107 by jmc, Mon Oct 29 19:14:12 2007 UTC
# Line 15  usage() Line 15  usage()
15      echo "  (-mpi)                   compile and run using MPI"      echo "  (-mpi)                   compile and run using MPI"
16      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
17      echo "                             (DEF=\"-ieee\")"      echo "                             (DEF=\"-ieee\")"
18      echo "  (-optfile=|-of=)STRING   list of optfiles to use"      echo "  (-of=|-optfile=)STRING   list of optfiles to use"
19      echo "  (-a|-addr) STRING        list of email recipients"      echo "  (-a|-addr) STRING        list of email recipients"
20      echo "                             (DEF=\"edhill@mitgcm.org\")"      echo "                             (DEF=\"edhill@mitgcm.org\")"
21      echo "  (-t|-tdir) STRING        list of group and/or exp. dirs to test"      echo "  (-t|-tdir) STRING        list of group and/or exp. dirs to test"
22      echo "                             (recognized groups: basic, tutorials)"      echo "                             (recognized groups: basic, tutorials)"
23      echo "                             (DEF=\"\" which test all)"      echo "                             (DEF=\"\" which test all)"
24        echo "  (-skd|-skipdir) STRING   list of exp. dirs to skip"
25        echo "                             (DEF=\"\" which test all)"
26      echo "  (-b|-bash) STRING        preferred location of a \"bash\" or"      echo "  (-b|-bash) STRING        preferred location of a \"bash\" or"
27      echo "                             Bourne-compatible \"sh\" shell"      echo "                             Bourne-compatible \"sh\" shell"
28      echo "                             (DEF=\"\" for \"bash\")"      echo "                             (DEF=\"\" for \"bash\")"
# Line 31  usage() Line 33  usage()
33      echo "                             (DEF=\"make\")"      echo "                             (DEF=\"make\")"
34      echo "  (-odir) STRING           used to build output directory name"      echo "  (-odir) STRING           used to build output directory name"
35      echo "                             (DEF=\"hostname\")"      echo "                             (DEF=\"hostname\")"
36      echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"      echo "  (-ptr|-ptracers) STRING  specify which ptracers to test"
37      echo "                             (DEF=\"1 2 3 4 5\")"      echo "                             (DEF=\"1 2 3 4 5\")"
38        echo "  (-match) NUMBER          Matching Criteria (number of digits)"
39        echo "                             (DEF=\"12\")"
40      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
41      echo "  (-clean)                 *ONLY* run \"make CLEAN\""      echo "  (-clean)                 *ONLY* run \"make CLEAN\""
42      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
# Line 40  usage() Line 44  usage()
44      echo "  (-noclean|-nc)           skip the \"make clean\" stage"      echo "  (-noclean|-nc)           skip the \"make clean\" stage"
45      echo "  (-nodepend|-nd)          skip the \"make depend\" stage"      echo "  (-nodepend|-nd)          skip the \"make depend\" stage"
46      echo "  (-deldir|-dd)            on success, delete the output directory"      echo "  (-deldir|-dd)            on success, delete the output directory"
47        echo "  (-ts)                    provide timing information per timestep"
48        echo "  (-papis)                 provide MFlop/s per timestep using PAPI"
49        echo "  (-pcls)                  provide MFlop/s per timestep using PCL"
50      echo      echo
51      echo "and where STRING can be a whitespace-delimited list"      echo "and where STRING can be a whitespace-delimited list"
52      echo "such as:"      echo "such as:"
# Line 87  build_mpack() Line 94  build_mpack()
94      echo "OK"      echo "OK"
95  }  }
96    
97  testoutput_for_prop()  testoutput_var()
98  {  {
99      # testoutput_for_prop dir s1 label subdir extension      # testoutput_var dir s1 label subdir reference_output
100      #      #
101      #  compares files in $dir/$subdir/output.txt and $dir/results/output.txt      #  compares 1 variable output selected from file $dir/$subdir/$OUTPUTFILE
102      #  using search strings s1 and text label      #     with same output from reference file $dir/results/$reference_output
103        #  using search strings s1 and text label
104    
105      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
106          echo testoutput_for_prop: grep "$2" $1/$4/output.txt 1>&2          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2
107      fi      fi
108      if [ -r $1/$4/output.txt ]; then      if [ -r $1/$4/$OUTPUTFILE ]; then
109          grep "$2" $1/$4/output.txt | 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
115              return 99              return 99
116          fi          fi
117      else      else
118          echo testoutput_for_prop: output.txt from model run was not readable 1>&2          echo testoutput_var: $OUTPUTFILE from model run was not readable 1>&2
119          return 99          return 99
120      fi      fi
121      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
122          echo testoutput_for_prop: 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 129  testoutput_for_prop() Line 137  testoutput_for_prop()
137      fi      fi
138      has_nan=`cat tmp1.txt | grep -i nan | wc -l`      has_nan=`cat tmp1.txt | grep -i nan | wc -l`
139      if [ $has_nan -gt 0  ] ; then      if [ $has_nan -gt 0  ] ; then
140          echo testoutput_for_prop: output.txt contains $has_nan NaN values  1>&2          echo testoutput_var: $OUTPUTFILE contains $has_nan NaN values  1>&2
141          return 99          return 99
142      fi      fi
143      has_inf=`cat tmp1.txt | grep -i inf | wc -l`      has_inf=`cat tmp1.txt | grep -i inf | wc -l`
144      if [ $has_inf -gt 0  ] ; then      if [ $has_inf -gt 0  ] ; then
145          echo testoutput_for_prop: output.txt contains $has_inf Inf values  1>&2          echo testoutput_var: $OUTPUTFILE contains $has_inf Inf values  1>&2
146          return 99          return 99
147      fi      fi
148      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
149          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2          echo testoutput_var: join tmp1.txt tmp2.txt 1>&2
150      fi      fi
151      join tmp1.txt tmp2.txt | awk '{print $1 " " $2 " " $3}' > tmp3.txt      join tmp1.txt tmp2.txt | awk '{print $1 " " $2 " " $3}' > tmp3.txt
152      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
153          echo testoutput_for_prop: compare_lines 1>&2          echo testoutput_var: compare_lines 1>&2
154      fi      fi
155      if [ $verbose -gt 1 ]; then      if [ $verbose -gt 1 ]; then
156          cat tmp3.txt 1>&2          cat tmp3.txt 1>&2
# Line 150  testoutput_for_prop() Line 158  testoutput_for_prop()
158      echo "-1" >> tmp3.txt      echo "-1" >> tmp3.txt
159      # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number      # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number
160      cat tmp3.txt | sed -e 's|:||g' > tmp4.txt      cat tmp3.txt | sed -e 's|:||g' > tmp4.txt
161      digits_of_similarity=`./tmp_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_for_prop: 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 181  dashnum() Line 189  dashnum()
189      done      done
190  }  }
191    
 testoutput_ad()  
 {  
     grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt  
     grep $3 $1/$2/output_adm.txt | awk '{print NR " " $5}' > t15.txt  
     grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt  
     grep $3 $1/$2/output_adm.txt | awk '{print NR " " $6}' > t16.txt  
     join t05.txt t15.txt > t5.txt  
     join t06.txt t16.txt > t6.txt  
     echo "-1" >> t5.txt  
     echo "-1" >> t6.txt  
     digits_5=`./tmp_cmpnum < t5.txt`  
     digits_6=`./tmp_cmpnum < t6.txt`  
     dashnum $digits_5 $digits_6  
     rm -f t[01][56].txt t[56].txt  
 }  
   
192  check_for_add_mon_output()  check_for_add_mon_output()
193  {  {
194      # Check for additional types of monitor output      # Check for additional types of monitor output
# Line 222  check_for_add_mon_output() Line 214  check_for_add_mon_output()
214      done      done
215  }  }
216    
217  testoutput()  testoutput_run()
218  {  {
219      # testoutput directory subdir extension      # testoutput_run directory subdir reference_output
220      #      #
221      #  test output in "directory"      #  test output from 1 run in "directory"
222      if test "x$ADM" = x ; then  # --> same processing for adjoint & forward test
223          if [ $debug -gt 0 ]; then          # default list of output variables to be checked:
224              echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2          #  1rst : main variable used to decide if it pass or FAIL
225          fi          #  others : number of matching digits to be printed in summary.txt
226          testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2 $3; cg2dres=$?          listChk=$DEF_CHECK_LIST
227          if [ $debug -gt 0 ]; then          #  load experiment-specific list from file "tr_checklist" (if it exist)
228              echo testoutput: cg2dres=$cg2dres 1>&2          if test -r $1/$2/tr_checklist ; then listChk=`cat $1/$2/tr_checklist` ; fi
229          fi          sVar=`echo $listChk | awk '{print $1}'`
230          testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2 $3; tmin=$?          # remove 1rst var and expand the list: + => min max mean s.d
231          testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2 $3; tmax=$?          listVar=`echo $listChk | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' \
232          testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2 $3; tmean=$?                                 | sed 's/+//g' | sed "s/^$sVar//"`
233          testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2 $3; tsd=$?          if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(I)='$listVar'" 1>&2 ; fi
234          testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2 $3; smin=$?          for ii in 1 2 3 4 5 6 7 8 9 ; do
235          testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2 $3; smax=$?            tst=`eval 'echo "$HAVE_PTR0'$ii'"'`
236          testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2 $3; smean=$?           #echo "-- ptr test=" $tst "number of var=" `echo $listVar | awk '{print NF}'` 1>&2
237          testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2 $3; ssd=$?            if test "x$tst" != xt ; then listVar=`echo "$listVar" | sed "s/ pt$ii..//g"` ; fi
238          testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2 $3; umin=$?          done
239          testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2 $3; umax=$?          tst=`echo $sVar $listVar | awk '{ for(i=2;i<=NF;i++){t+=($i==$1)}; print t }'`
240          testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2 $3; umean=$?          if test $tst != 1 ; then
241          testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2 $3; usd=$?            if test $tst = 0 ; then echo "==> WARNING: selected var >$sVar< not found" 1>&2
242          testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2 $3; vmin=$?                   else echo "==> WARNING: found selected var >$sVar< $tst times" 1>&2 ; fi
243          testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2 $3; vmax=$?            echo "==> WARNING: in checked list:" $listVar 1>&2
244          testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2 $3; vmean=$?          #- put it back once:
245          testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2 $3; vsd=$?            listVar=" $sVar "`echo "$listVar " | sed "s/ $sVar / /g"`
246            fi
247          #  This is for PTRACERS          if [ $debug -gt 0 ]; then echo "testoutput_run: listVar(M)='$listVar'" 1>&2 ; fi
248          for ii in $PTRACERS_NUM ; do          echo "listVar='$listVar'" > $CDIR"/summary.txt"
249              eval `echo "p0"$ii"_min=99"`          allargs=""
250              eval `echo "p0"$ii"_max=99"`          for xx in $listVar
251              eval `echo "p0"$ii"_mean=99"`          do
252              eval `echo "p0"$ii"_sd=99"`            case $xx in
253              tst=`eval 'echo "$HAVE_PTR0'$ii'"'`             'PS')  if [ $debug -gt 0 ]
254              #echo 'tst = '$tst                    then echo testoutput_run: testoutput_var $1 cg2d_init_res 1>&2 ; fi
255              if test "x$tst" = xt ; then                    testoutput_var $1 "cg2d_init_res" "Press. Solver (cg2d)" $2 $3; yy=$?
256                  a="trcstat_ptracer0"                    if [ $debug -gt 0 ] ; then echo testoutput_run: cg2dres=$yy 1>&2 ; fi ;;
257                  testoutput_for_prop $1 "$a"$ii"_min"  "p0"$ii"_min"  $2 $3            'Cost') testoutput_var $1 "ADM  precision_derivative_cost" "ADM Cost" $2 $3; yy=$? ;;
258                  RETVAL=$? ; eval `echo "p0"$ii"_min="$RETVAL`            'Grad') testoutput_var $1 "ADM  precision_derivative_grad" "ADM Grad" $2 $3; yy=$? ;;
259                  testoutput_for_prop $1 "$a"$ii"_max"  "p0"$ii"_max"  $2 $3             'Tmn') testoutput_var $1 "dynstat_theta_min"  "Theta minimum"  $2 $3; yy=$? ;;
260                  RETVAL=$? ; eval `echo "p0"$ii"_max="$RETVAL`             'Tmx') testoutput_var $1 "dynstat_theta_max"  "Theta maximum"  $2 $3; yy=$? ;;
261                  testoutput_for_prop $1 "$a"$ii"_mean" "p0"$ii"_mean" $2 $3             'Tav') testoutput_var $1 "dynstat_theta_mean" "Theta mean"     $2 $3; yy=$? ;;
262                  RETVAL=$? ; eval `echo "p0"$ii"_mean="$RETVAL`             'Tsd') testoutput_var $1 "dynstat_theta_sd"   "Theta Std.Dev"  $2 $3; yy=$? ;;
263                  testoutput_for_prop $1 "$a"$ii"_sd"   "p0"$ii"_sd"   $2 $3             'Smn') testoutput_var $1 "dynstat_salt_min"  "Salt minimum"    $2 $3; yy=$? ;;
264                  RETVAL=$? ; eval `echo "p0"$ii"_sd="$RETVAL`             'Smx') testoutput_var $1 "dynstat_salt_max"  "Salt maximum"    $2 $3; yy=$? ;;
265              fi             'Sav') testoutput_var $1 "dynstat_salt_mean" "Salt mean"       $2 $3; yy=$? ;;
266          done             'Ssd') testoutput_var $1 "dynstat_salt_sd"   "Salt Std.Dev"    $2 $3; yy=$? ;;
267               'Umn') testoutput_var $1 "dynstat_uvel_min"  "U minimum"       $2 $3; yy=$? ;;
268          allargs="$cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd"             'Umx') testoutput_var $1 "dynstat_uvel_max"  "U maximum"       $2 $3; yy=$? ;;
269          allargs="$allargs $umin $umax $umean $usd $vmin $vmax $vmean $vsd"             'Uav') testoutput_var $1 "dynstat_uvel_mean" "U mean"          $2 $3; yy=$? ;;
270          allargs="$allargs $p01_min $p01_max $p01_mean $p01_sd"             'Usd') testoutput_var $1 "dynstat_uvel_sd"   "U Std.Dev"       $2 $3; yy=$? ;;
271          allargs="$allargs $p02_min $p02_max $p02_mean $p02_sd"             'Vmn') testoutput_var $1 "dynstat_vvel_min"  "V minimum"       $2 $3; yy=$? ;;
272          allargs="$allargs $p03_min $p03_max $p03_mean $p03_sd"             'Vmx') testoutput_var $1 "dynstat_vvel_max"  "V maximum"       $2 $3; yy=$? ;;
273          allargs="$allargs $p04_min $p04_max $p04_mean $p04_sd"             'Vav') testoutput_var $1 "dynstat_vvel_mean" "V mean"          $2 $3; yy=$? ;;
274          allargs="$allargs $p05_min $p05_max $p05_mean $p05_sd"             'Vsd') testoutput_var $1 "dynstat_vvel_sd"   "V Std.Dev"       $2 $3; yy=$? ;;
275            'pt1mn'|'pt2mn'|'pt3mn'|'pt4mn'|'pt5mn') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
276          eval "dashnum $allargs"             testoutput_var $1 "trcstat_ptracer0"$ii"_min"  "p0"$ii"_min"   $2 $3; yy=$? ;;
277            'pt1mx'|'pt2mx'|'pt3mx'|'pt4mx'|'pt5mx') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
278      else             testoutput_var $1 "trcstat_ptracer0"$ii"_max"  "p0"$ii"_max"   $2 $3; yy=$? ;;
279          testoutput_ad $1 $2 "precision_grdchk_result"          'pt1av'|'pt2av'|'pt3av'|'pt4av'|'pt5av') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
280      fi             testoutput_var $1 "trcstat_ptracer0"$ii"_mean" "p0"$ii"_mean" $2 $3; yy=$? ;;
281            'pt1sd'|'pt2sd'|'pt3sd'|'pt4sd'|'pt5sd') ii=`echo $xx | sed 's/pt//' | sed 's/..$//'`
282               testoutput_var $1 "trcstat_ptracer0"$ii"_sd"   "p0"$ii"_StDv"  $2 $3; yy=$? ;;
283             'Qntmn') testoutput_var $1 "extforcing_qnet_min" "Qnet minimum"  $2 $3; yy=$? ;;
284             'Qntmx') testoutput_var $1 "extforcing_qnet_max" "Qnet maximum"  $2 $3; yy=$? ;;
285             'Qntav') testoutput_var $1 "extforcing_qnet_mean" "Qnet mean"    $2 $3; yy=$? ;;
286             'Qntsd') testoutput_var $1 "extforcing_qnet_sd"  "Qnet Std.Dev"  $2 $3; yy=$? ;;
287             'aSImn') testoutput_var $1 "seaice_area_min"   "SIce Area min"   $2 $3; yy=$? ;;
288             'aSImx') testoutput_var $1 "seaice_area_max"   "SIce Area max"   $2 $3; yy=$? ;;
289             'aSIav') testoutput_var $1 "seaice_area_mean"  "SIce Area mean"  $2 $3; yy=$? ;;
290             'aSIsd') testoutput_var $1 "seaice_area_sd"    "SIce Area StDv"  $2 $3; yy=$? ;;
291             'hSImn') testoutput_var $1 "seaice_heff_min"   "SIce Heff min"   $2 $3; yy=$? ;;
292             'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Hell max"   $2 $3; yy=$? ;;
293             'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Hell mean"  $2 $3; yy=$? ;;
294             'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Hell StDv"  $2 $3; yy=$? ;;
295            'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;;
296            'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $3; yy=$? ;;
297            'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $3; yy=$? ;;
298            'HthSiG') testoutput_var $1 "thSI_IceH_ave_G" "thSIc H Global"    $2 $3; yy=$? ;;
299            'HthSiS') testoutput_var $1 "thSI_IceH_ave_S" "thSIc H South"     $2 $3; yy=$? ;;
300            'HthSiN') testoutput_var $1 "thSI_IceH_ave_N" "thSIc H North"     $2 $3; yy=$? ;;
301                  *) yy=99; echo "WARNING: asking for var=$xx : not recognized !" 1>&2 ;;
302              esac
303              if test $xx = $sVar
304              then allargs="$allargs > $yy <"
305              else allargs="$allargs $yy"
306              fi
307            done
308    
309            nbVar=`echo $listVar | awk '{print NF}'`
310            if [ $nbVar -lt $LEN_CHECK_LIST ] ; then
311            #-- fill line (up to standard length) with dot:
312              adNul=`expr $LEN_CHECK_LIST - $nbVar | awk '{for(i=1;i<=$1;i++){print "."}}'`
313              echo $allargs $adNul
314            else
315              echo $allargs
316            fi
317    # <-- same processing for adjoint & forward test
318  }  }
319    
320  genmakemodel()  genmakemodel()
# Line 316  genmakemodel() Line 345  genmakemodel()
345              if test "x$MPI" = xt ; then              if test "x$MPI" = xt ; then
346                  command="$command -mpi"                  command="$command -mpi"
347              fi              fi
348                if test "x$TS" = xt ; then
349                    command="$command -ts"
350                fi
351                if test "x$PAPIS" = xt ; then
352                    command="$command -papis"
353                else
354                if test "x$PCLS" = xt ; then
355                    command="$command -pcls"
356                fi
357                fi
358              printf 'genmake ... ' 1>&2              printf 'genmake ... ' 1>&2
359              $command > make.log 2>&1              $command > make.log 2>&1
360              RETVAL=$?              RETVAL=$?
# Line 341  makeclean() Line 380  makeclean()
380      else      else
381          (          (
382              cd $1;              cd $1;
383              #if test -e output.txt ; then rm -f output.txt ; fi              #if test -e $OUTPUTFILE ; then rm -f $OUTPUTFILE ; fi
384              if test -r Makefile ; then              if test -r Makefile ; then
385                  printf 'clean build-dir: make Clean ... ' 2>&1                  printf 'clean build-dir: make Clean ... ' 2>&1
386                  $MAKE Clean >> make.log 2>&1                  $MAKE Clean >> make.log 2>&1
# Line 375  run_clean() Line 414  run_clean()
414              find . -type l -exec rm {} \;              find . -type l -exec rm {} \;
415              rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime              rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime
416              rm -rf mnc_test_*              rm -rf mnc_test_*
417                rm -f *_MIT_CE_000.opt0000 costfunction*0000
418              echo successful 1>&2              echo successful 1>&2
419              exit 0              exit 0
420          )          )
# Line 536  runmodel() Line 576  runmodel()
576          printf 'runmodel in %s ...' $1 1>&2          printf 'runmodel in %s ...' $1 1>&2
577          # make output.txt          # make output.txt
578          echo          echo
579          rm -f run.log          if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
580                diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
581                outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi
582            fi
583          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
584              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
585              ln -sf "../"$builddir"/"$EXECUTABLE .              ln -sf "../"$builddir"/"$EXECUTABLE .
         else  
             touch run.log  
586          fi          fi
587          if test ! -x $EXECUTABLE ; then          if test ! -x $EXECUTABLE ; then
588                    rm -f run.log ; touch run.log
589                    if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
590                  echo " no executable:" $EXECUTABLE >> run.log                  echo " no executable:" $EXECUTABLE >> run.log
591                  RETVAL=8                  RETVAL=8
592                    ENDVAL=-1
593          else          else
594              if test $OUTPUTFILE -ot $EXECUTABLE ; then              if test ! -f $OUTPUTFILE -o $OUTPUTFILE -ot $EXECUTABLE ; then
595                  # output do not exist or is older than executable:
596                    rm -f run.log ; touch run.log
597                    if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
598                  ( eval $COMMAND ) >> run.log 2>&1                  ( eval $COMMAND ) >> run.log 2>&1
599                  RETVAL=$?                  RETVAL=$?
600              else              else
                 echo " $OUTPUTFILE is up to date " >> run.log 2>&1  
601                  RETVAL=0                  RETVAL=0
602                    if test -f run.log ; then
603                        if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
604                        echo "---------->> $OUTPUTFILE is up to date " >> run.log 2>&1
605                    else
606                        touch run.log
607                        if test -f run.log_00 ; then cat run.log_00 >> run.log ; fi
608                        echo "---------->> $OUTPUTFILE is up to date " >> run.log 2>&1
609                        echo " no previous run.log: assume NORMAL END" >> run.log 2>&1
610                    fi
611              fi              fi
612                ENDVAL=`cat run.log | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`
613          fi          fi
614          # echo "COMMAND='$COMMAND'"          rm -f run.log_00
615          # echo "pwd='"`pwd`"'"          #if test "x$RETVAL" = x0 ; then
616          if test "x$RETVAL" = x0 ; then          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
617              tail run.log              tail run.log
618              echo successful 1>&2              echo successful 1>&2
619              # === Reduce the size of the testing emails!              # === Reduce the size of the testing emails!
620              # if test "x$ADM" = x ; then              #cp $OUTPUTFILE $CDIR"/"$OUTPUTFILE
             #   cp output.txt $CDIR"/output.txt"  
             # else  
             #   cp output_adm.txt $CDIR"/output_adm.txt"  
             # fi  
621              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
622              return 0              return 0
623          else          else
624              tail run.log              tail run.log
625              echo failed 1>&2              echo failed '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2
626              cp run.log $CDIR"/run.log"              cp run.log $CDIR"/run.log"
627              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi              if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
628              return 1              return 1
# Line 583  createcodelet() Line 635  createcodelet()
635      # create codelet for comparing model output      # create codelet for comparing model output
636    
637      printf "creating the comparison code...  "      printf "creating the comparison code...  "
638      cat > tmp_cmpnum.c <<EOF      cat > tr_cmpnum.c <<EOF
639  #include <stdio.h>  #include <stdio.h>
640  #include <math.h>  #include <math.h>
641  int main( int argc, char** argv )  {  int main( int argc, char** argv )  {
642    int linnum,best,lncnt;    int linnum,cmplin,best,lncnt;
643    double a,b,abave,relerr;    double a,b,abave,relerr;
644    best = -22;    best = -22;
645    lncnt = 0;    lncnt = 0;
646    while( 1 & (lncnt+=1) < 999 )  {    while( 1 & ( (lncnt+=1) < 999 ) )  {
647      scanf("%d", &linnum);      scanf("%d", &linnum);
648      if (linnum == -1)  break;      if (linnum == -1)  break;
649      scanf("%lf", &a);  scanf("%lf", &b);      scanf("%lf", &a);  scanf("%lf", &b);
650      abave = 0.5*(fabs(a)+fabs(b));      abave = 0.5*(fabs(a)+fabs(b));
651      if (abave > 0.0) {      if ( abave == abave ) {
652        relerr=fabs(a-b)/abave;        if (abave > 0.0) {
653        if (relerr > 0.0) { linnum = (int)rint(log10(relerr)); }          relerr=fabs(a-b)/abave;
654        else { linnum = -16 ; }          if (relerr > 0.0) { cmplin = (int)rint(log10(relerr)); }
655        best = (best > linnum) ? best : linnum;          else { cmplin = -16 ; }
656      }          best = (best > cmplin) ? best : cmplin; }
657          else { cmplin = -22 ; }
658       /* printf("%d ; %lf ; %lf\n",cmplin,a,b); */
659          }
660       else {
661       /* printf("%lf ; %lf ; %lf\n",abave,a,b); */
662          break; }
663    }    }
664    if (lncnt == 999) best=-29;    if (lncnt == 999) best=-29;
665      if (linnum != -1) best=-99;
666    printf("%d\n", -best);    printf("%d\n", -best);
667    return 0;    return 0;
668  }  }
669  EOF  EOF
670      $CC -o tmp_cmpnum tmp_cmpnum.c -lm      $CC -o tr_cmpnum tr_cmpnum.c -lm
671    
672      if [ -x ./tmp_cmpnum ]; then      if [ -x ./tr_cmpnum ]; then
673          echo "OK"          echo "OK"
674          return 0          return 0
675      else      else
# Line 628  formatresults() Line 687  formatresults()
687      nm=$1      nm=$1
688      printf '%s %s %s %s' $2 $3 $4 $5      printf '%s %s %s %s' $2 $3 $4 $5
689      shift; shift; shift; shift; shift;      shift; shift; shift; shift; shift;
690      printf '%3s' $@      listPrt=$@
691        listRes=`echo $listPrt | sed 's/>//' | sed 's/<//'`
692        xx=`echo $listPrt | sed 's/.*>//' | sed 's/<.*//' | awk '{print $1}'`
693        printf '%3s' $listPrt
694    #   line below does not work on hp-ux_ia64 : do those substitutions later on
695    #   printf '%3s' $listPrt | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</'
696            
697      if [ $1 = '--' ]; then      if [ $xx = '..' ]; then
698            printf ' N/O '
699        elif [ $xx = '--' ]; then
700            printf ' N/O '
701        elif [ $xx = 99 ]; then
702          printf ' N/O '          printf ' N/O '
703      else      else
704          if [ $1 -gt 12 ]; then          if [ $xx -ge $MATCH_CRIT ]; then
705              printf ' pass'              printf ' pass'
706          else          else
707              printf ' FAIL'              printf ' FAIL'
# Line 644  formatresults() Line 712  formatresults()
712            
713  }  }
714    
 show_help()  
 {  
     cat - << EOF  
 $0 [-help] [-quick] [-verbose] dir1 [dir2] [...]  
   
  -help|-h      Show this help message  
  -quiet     Reduce the amount of output  
  -verbose   Produce copious amounts of output  
  -debug     Produce even more output which will mean nothing to most  
  -force     Do "make CLEAN" before compiling. This forces a complete rebuild.  
  -clean     Do "make CLEAN" after compiling and testing.  
  -cleanup   Aggresively removes all model output, executables and object files  
             and then exits. Use with care.  
   
 Normal usage:  
  $0 *       Configure, compile, run and analyze in all experiment directories  
 EOF  
 }  
   
715  scandirs()  scandirs()
716  {  {
717      if [ $# -eq 1 ]; then      if [ $# -eq 1 ]; then
718          for arg in * ; do          for arg in * ; do
719              test -d $arg/$1 && echo $arg              test -f $arg/$1 && echo $arg
720          done          done
721      else      else
722          echo $*          echo $*
# Line 702  BASH= Line 751  BASH=
751  OPTFILE=NONE  OPTFILE=NONE
752  ADDRESSES=  ADDRESSES=
753  TESTDIRS=  TESTDIRS=
754    SKIPDIRS=
755  MPACKDIR="../tools/mpack-1.6"  MPACKDIR="../tools/mpack-1.6"
756  HAVE_MPACK=  HAVE_MPACK=
757  MPACK="$MPACKDIR/mpack"  MPACK="$MPACKDIR/mpack"
# Line 723  ADM= Line 773  ADM=
773  # Additional monitor types  # Additional monitor types
774  PTRACERS_NUM="1 2 3 4 5"  PTRACERS_NUM="1 2 3 4 5"
775    
776    MATCH_CRIT=13
777    
778  printf "parsing options...  "  printf "parsing options...  "
779    
780  ac_prev=  ac_prev=
# Line 757  for ac_option ; do Line 809  for ac_option ; do
809          -tdir=* | --tdir=*)          -tdir=* | --tdir=*)
810              TESTDIRS=$ac_optarg ;;              TESTDIRS=$ac_optarg ;;
811    
812            -skipdir | --skipdir | -skd | --skd)
813                ac_prev=SKIPDIRS ;;
814            -skipdir=* | --skipdir=*)
815                SKIPDIRS=$ac_optarg ;;
816    
817          -bash | --bash | -b | --b)          -bash | --bash | -b | --b)
818              ac_prev=BASH ;;              ac_prev=BASH ;;
819          -bash=* | --bash=*)          -bash=* | --bash=*)
# Line 782  for ac_option ; do Line 839  for ac_option ; do
839          -ptracers=* | --ptracers=* | -ptr=* | --ptr=*)          -ptracers=* | --ptracers=* | -ptr=* | --ptr=*)
840              PTRACERS_NUM=$ac_optarg ;;              PTRACERS_NUM=$ac_optarg ;;
841    
842            -match | --match ) ac_prev=MATCH_CRIT ;;
843            -match=* | --match=* ) MATCH_CRIT=$ac_optarg ;;
844    
845          -j) ac_prev=JOBS ;;          -j) ac_prev=JOBS ;;
846          -j=*) JOBS=$ac_optarg ;;          -j=*) JOBS=$ac_optarg ;;
847    
# Line 815  for ac_option ; do Line 875  for ac_option ; do
875    
876          -deldir | -dd) DELDIR=t ;;          -deldir | -dd) DELDIR=t ;;
877    
878            -ts) TS=t;;
879    
880            -papis) PAPIS=t;;
881    
882            -pcls) PCL=t;;
883    
884          -*)          -*)
885              echo "Error: unrecognized option: "$ac_option              echo "Error: unrecognized option: "$ac_option
886              usage              usage
# Line 835  if test "x$QUICK" = xt ; then Line 901  if test "x$QUICK" = xt ; then
901      NODEPEND=t      NODEPEND=t
902  fi  fi
903    
904    #- setting for forward or ADM testing
905    if test "x$ADM" = xt ; then
906        code_dir=code_ad
907        input_dirs='input_ad input'
908        ref_outp="output_adm.txt"
909        EXECUTABLE="mitgcmuv_ad"
910    else
911        code_dir=code
912        input_dirs='input'
913        ref_outp="output.txt"
914        EXECUTABLE="mitgcmuv"
915    fi
916    
917  if test "x$TESTDIRS" = x ; then  if test "x$TESTDIRS" = x ; then
918      if test "x$ADM" = xt ; then      LIST=`scandirs results/$ref_outp`
         TESTDIRS=`scandirs results_ad`  
     else  
         TESTDIRS=`scandirs results`  
     fi  
919  else  else
920      #- expand group of experiments:      #- expand group of experiments:
921      LIST=" "      LIST=" "
# Line 856  else Line 931  else
931          *)       LIST=${LIST}" "$xx ;;          *)       LIST=${LIST}" "$xx ;;
932        esac        esac
933      done      done
934      #echo 'LIST='${LIST}'<'  fi
935      #- remove duplicate and non-directory:  #echo 'LIST='${LIST}'<'
936      TESTDIRS=" "  #- skip dirs, remove duplicate and non-directory:
937      for xx in $LIST  TESTDIRS=" "
938      do  count=0
939    for xx in $LIST
940    do
941        yy=`echo $SKIPDIRS | grep -c $xx`
942        if test $yy = 0 ; then
943          if test -d $xx ; then          if test -d $xx ; then
944              yy=`echo $TESTDIRS | grep -c $xx`              yy=`echo $TESTDIRS | grep -c $xx`
945              if test $yy = 0 ; then TESTDIRS=${TESTDIRS}" "$xx ; fi              if test $yy = 0 ; then TESTDIRS=${TESTDIRS}" "$xx ; fi
946          else          else count=1 ;
947              echo " -- skip \"$xx\" : not a directory !"              echo ""; echo -n " -- skip \"$xx\" (not a directory !)"
948          fi          fi
949      done      else
950  fi          if test $count = 1 ; then echo -n ", \"$xx\""
951            else count=1 ; echo "" ;  echo -n " skip: \"$xx\""
952            fi
953        fi
954    done
955    if test $count = 1 ; then echo "" ; echo -n " ... " ; fi
956  #echo 'TESTDIRS='${TESTDIRS}'<'  #echo 'TESTDIRS='${TESTDIRS}'<'
957    
958  if test "x$OPTFILE" = xNONE -a "x$MITGCM_OF" != x ; then  if test "x$OPTFILE" = xNONE -a "x$MITGCM_OF" != x ; then
959      OPTFILE=$MITGCM_OF      OPTFILE=$MITGCM_OF
960  fi  fi
961    
962  if test "x$ADM" = xt ; then  OUTPUTFILE=$ref_outp
     EXECUTABLE="mitgcmuv_ad"  
     OUTPUTFILE="output_adm.txt"  
 else  
     EXECUTABLE="mitgcmuv"  
     OUTPUTFILE="output.txt"  
 fi  
   
 if test "x$ADM" = xt -a "x$COMMAND" = x ; then  
     COMMAND="./$EXECUTABLE > $OUTPUTFILE"  
 fi  
   
963  if test "x$COMMAND" = x ; then  if test "x$COMMAND" = x ; then
964      COMMAND="./$EXECUTABLE > $OUTPUTFILE"      COMMAND="./$EXECUTABLE > $OUTPUTFILE"
965  fi  fi
966    if test "x$MPI" = xt ; then
967        OUTPUTFILE="STDOUT.0000"
968    fi
969    
 #echo "OK"  
970  echo "OK (COMMAND= $COMMAND )"  echo "OK (COMMAND= $COMMAND )"
971    
972    # set the Default List of output variables to be checked:
973    #  (use default or load experiment-specific list from file "tr_checklist")
974    # content : 1rst = main variable used to decide if it pass or FAIL
975    #         others = number of matching digits to be printed in summary.txt
976    if test "x$ADM" = x ; then
977        DEF_CHECK_LIST='PS PS T+ S+ U+ V+ pt1+ pt2+ pt3+ pt4+ pt5+'
978        EMPTY_RESULTS='.. .. .. .. .. .. .. .. .. .. .. .. .. .. .. .. ..'
979        LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
980        ii=`echo $EMPTY_RESULTS | awk '{print NF}'`
981        EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`
982    else
983        DEF_CHECK_LIST='Grad Cost Grad'
984        EMPTY_RESULTS='.. ..'
985        LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
986    fi
987    
988  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
989  createcodelet  createcodelet
990    
# Line 957  fi Line 1048  fi
1048  echo  echo
1049  echo >> $SUMMARY  echo >> $SUMMARY
1050  if test "x$ADM" = x ; then  if test "x$ADM" = x ; then
1051      line_0="            ----T-----  ----S-----  ----U-----  ----V-----"      if [ $MATCH_CRIT -lt 10 ] ;
1052        then line_0="default  "$MATCH_CRIT ;
1053        else line_0="default "$MATCH_CRIT ; fi
1054           line_0="$line_0  ----T-----  ----S-----  ----U-----  ----V-----"
1055    #   line_0="            ----T-----  ----S-----  ----U-----  ----V-----"
1056      line_1="G D M    c        m  s        m  s        m  s        m  s"      line_1="G D M    c        m  s        m  s        m  s        m  s"
1057      line_2="E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  ."      line_2="E p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  ."
1058      line_3="N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d"      line_3="N n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d"
# Line 981  if test "x$ADM" = x ; then Line 1076  if test "x$ADM" = x ; then
1076  else  else
1077      echo "ADJOINT=true" >> $SUMMARY      echo "ADJOINT=true" >> $SUMMARY
1078      echo >> $SUMMARY      echo >> $SUMMARY
1079        if [ $MATCH_CRIT -lt 10 ] ;
1080        then line_0="default     "$MATCH_CRIT ;
1081        else line_0="default    "$MATCH_CRIT ; fi
1082        echo "$line_0" | tee -a $SUMMARY
1083      cat << EOF | tee -a $SUMMARY      cat << EOF | tee -a $SUMMARY
1084  G D M    C  G  G D M    C  G
1085  E p a R  o  r  E p a R  o  r
# Line 993  fi Line 1092  fi
1092  #  ...and each test directory...  #  ...and each test directory...
1093  for dir in $TESTDIRS ; do  for dir in $TESTDIRS ; do
1094            
1095        # set builddir & rundir:
1096        builddir="build"
1097        if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
1098        rundir="run"
1099        if test ! -d $dir/$rundir ; then
1100            rundir=$builddir
1101        fi
1102        CODE_DIR=$dir/$code_dir
1103        BUILD_DIR=$dir/$builddir
1104    
1105      #  Cleanup only!      #  Cleanup only!
1106      if test "x$CLEANUP" = xt ; then      if test "x$CLEANUP" = xt ; then
1107          if test -r $dir/build/Makefile ; then          if test -r $BUILD_DIR/Makefile ; then
1108              echo '  ------  clean dir:' $dir/build              echo '  ------  clean dir:' $dir/build
1109              ( cd $dir/build ; make CLEAN )              ( cd $BUILD_DIR ; make CLEAN )
1110          fi          fi
1111          if test -d $dir/run/CVS ; then          if test -d $dir/$rundir/CVS ; then
1112              echo '  ------  clean dir:' $dir/run              echo '  ------  clean dir:' $dir/$rundir
1113              run_clean $dir/run              run_clean $dir/$rundir
1114          fi          fi
1115          (          (
1116              cd $dir              cd $dir
# Line 1012  for dir in $TESTDIRS ; do Line 1121  for dir in $TESTDIRS ; do
1121    
1122      #  Verify that the testdir exists and contains previous      #  Verify that the testdir exists and contains previous
1123      #  results in the correct location--or skip this directory!      #  results in the correct location--or skip this directory!
1124      fout=      fout=$dir"/results/"$ref_outp
     if test "x$ADM" = x ; then  
         fout=$dir"/results/output.txt"  
     else  
         fout=$dir"/results_ad/output_adm.txt"  
     fi  
1125      if test ! -r $fout ; then      if test ! -r $fout ; then
1126          echo "can't read \"$fout\" -- skipping $dir"          echo "can't read \"$fout\" -- skipping $dir"
1127          continue          continue
# Line 1028  for dir in $TESTDIRS ; do Line 1132  for dir in $TESTDIRS ; do
1132    
1133      # Check for additional types of monitor output      # Check for additional types of monitor output
1134    
     builddir="build"  
     if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi  
     rundir="run"  
    #rundir=$builddir  
     if test ! -d $dir/$rundir ; then  
         rundir=$builddir  
     fi  
       
     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  
     BUILD_DIR=$dir/$builddir  
   
1135      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
1136          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
1137          continue          continue
# Line 1086  for dir in $TESTDIRS ; do Line 1171  for dir in $TESTDIRS ; do
1171      fi      fi
1172      echo      echo
1173      unset genmake makedepend make run      unset genmake makedepend make run
1174      results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'      results=$EMPTY_RESULTS
1175    
1176      #  Create an output dir for each OPTFILE/tdir combination      #  Create an output dir for each OPTFILE/tdir combination
1177      rel_CDIR=$DRESULTS"/"$dir      rel_CDIR=$DRESULTS"/"$dir
# Line 1106  for dir in $TESTDIRS ; do Line 1191  for dir in $TESTDIRS ; do
1191              && makemodel $dir/$builddir && make=Y \              && makemodel $dir/$builddir && make=Y \
1192              && linkdata $dir/$rundir $input_dirs \              && linkdata $dir/$rundir $input_dirs \
1193              && runmodel $dir/$rundir && run=Y \              && runmodel $dir/$rundir && run=Y \
1194              && results=`testoutput $dir $rundir "txt"`              && results=`testoutput_run $dir $rundir $ref_outp`
1195      fi      fi
1196            
1197      echo      echo
1198      if test "x$ADM" = x ; then  # --> same processing for adjoint & forward test
1199          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1200          echo          echo
1201          echo "$fres" >> $SUMMARY          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1202          echo "fresults='$fres'" > $CDIR"/summary.txt"          touch $CDIR"/summary.txt"
1203            echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"
1204          echo "MACH='$MACH'" >> $CDIR"/summary.txt"          echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1205          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1206          echo "DATE='$DATE'" >> $CDIR"/summary.txt"          echo "DATE='$DATE'" >> $CDIR"/summary.txt"
# Line 1122  for dir in $TESTDIRS ; do Line 1208  for dir in $TESTDIRS ; do
1208    
1209          for ex in $extra_runs ; do          for ex in $extra_runs ; do
1210              unset run              unset run
1211              results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --'              results=$EMPTY_RESULTS
1212                #  reference output file
1213                refExOut=`echo $ref_outp | sed "s/\./.${ex}./g"`
1214              #  Create an output dir for each OPTFILE/tdir.ex combination              #  Create an output dir for each OPTFILE/tdir.ex combination
1215              rel_CDIR=$DRESULTS"/"$dir"."$ex              rel_CDIR=$DRESULTS"/"$dir"."$ex
1216              mkdir $rel_CDIR              mkdir $rel_CDIR
1217              CDIR=`pwd`"/$rel_CDIR"              CDIR=`pwd`"/$rel_CDIR"
1218              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
1219              run_clean $dir/tr_run.$ex              run_clean $dir/tr_run.$ex
1220              linkdata $dir/tr_run.$ex input.$ex input              linkdata $dir/tr_run.$ex input.$ex input
1221              runmodel $dir/tr_run.$ex && run=Y \              runmodel $dir/tr_run.$ex && run=Y \
1222                  && results=`testoutput $dir tr_run.$ex ${ex}".txt"`              && results=`testoutput_run $dir tr_run.$ex $refExOut`
             fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`  
1223              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1224              fres="$fres.$ex"              fres="$fres.$ex"
1225              echo              echo
1226              echo "$fres" >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1227              echo "fresults='$fres'" > $CDIR"/summary.txt"              touch $CDIR"/summary.txt"
1228                echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $CDIR"/summary.txt"
1229              echo "MACH='$MACH'" >> $CDIR"/summary.txt"              echo "MACH='$MACH'" >> $CDIR"/summary.txt"
1230              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1231              echo "DATE='$DATE'" >> $CDIR"/summary.txt"              echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1232              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"
1233              if test "x$POSTCLEAN" = xt ; then              if test "x$POSTCLEAN" = xt ; then
1234                  run_clean $dir/tr_run.$ex                  run_clean $dir/tr_run.$ex
1235              fi              fi
1236          done          done
1237      else  # <-- same processing for adjoint & forward test
1238          fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`      if test "x$ADM" = xt ; then
1239          fres=$fres"$results   $dir"          head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt"
1240          echo          grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
         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"  
         grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \  
1241                             >> $CDIR"/summary.txt"                             >> $CDIR"/summary.txt"
1242      fi      fi
1243    
# Line 1202  else Line 1283  else
1283      fi      fi
1284  fi  fi
1285    
1286  # rm -f tmp_cmpnum.f a.out  rm -f tr_cmpnum.c tr_cmpnum
 rm -f tmp_cmpnum.c tmp_cmpnum  
1287    
1288  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
1289      cat $SUMMARY | sed 's/ -- -- -- --//g'      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'
1290      if test -e tr_out.txt ; then      if test -e tr_out.txt ; then
1291          mv tr_out.txt tr_out.txt.old          mv tr_out.txt tr_out.txt.old
1292      fi      fi
1293      cat $SUMMARY | sed 's/ -- -- -- --//g' > tr_out.txt      cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/ \. //g' > tr_out.txt
1294  fi  fi
1295    
1296  if test "x$DELDIR" = xt ; then  if test "x$DELDIR" = xt ; then
Legend:
Removed from v.1.86  
changed lines
  Added in v.1.107
  ViewVC Help
Powered by ViewVC 1.1.22