/[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.167 by jmc, Mon Sep 26 12:58:48 2011 UTC revision 1.170 by mlosch, Thu Dec 22 12:55:05 2011 UTC
# Line 290  testoutput_run() Line 290  testoutput_run()
290           'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Heff max"   $2 $3; yy=$? ;;           'hSImx') testoutput_var $1 "seaice_heff_max"   "SIce Heff max"   $2 $3; yy=$? ;;
291           'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Heff mean"  $2 $3; yy=$? ;;           'hSIav') testoutput_var $1 "seaice_heff_mean"  "SIce Heff mean"  $2 $3; yy=$? ;;
292           'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Heff StDv"  $2 $3; yy=$? ;;           'hSIsd') testoutput_var $1 "seaice_heff_sd"    "SIce Heff StDv"  $2 $3; yy=$? ;;
293             'uSImn') testoutput_var $1 "seaice_uice_min"   "SIce Uice min"   $2 $3; yy=$? ;;
294             'uSImx') testoutput_var $1 "seaice_uice_max"   "SIce Uice max"   $2 $3; yy=$? ;;
295             'uSIav') testoutput_var $1 "seaice_uice_mean"  "SIce Uice mean"  $2 $3; yy=$? ;;
296             'uSIsd') testoutput_var $1 "seaice_uice_sd"    "SIce Uice StDv"  $2 $3; yy=$? ;;
297             'vSImn') testoutput_var $1 "seaice_vice_min"   "SIce Vice min"   $2 $3; yy=$? ;;
298             'vSImx') testoutput_var $1 "seaice_vice_max"   "SIce Vice max"   $2 $3; yy=$? ;;
299             'vSIav') testoutput_var $1 "seaice_vice_mean"  "SIce Vice mean"  $2 $3; yy=$? ;;
300             'vSIsd') testoutput_var $1 "seaice_vice_sd"    "SIce Vice StDv"  $2 $3; yy=$? ;;
301          'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;;          'AthSiG') testoutput_var $1 "thSI_Ice_Area_G" "thSIc Area Global" $2 $3; yy=$? ;;
302          'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $3; yy=$? ;;          'AthSiS') testoutput_var $1 "thSI_Ice_Area_S" "thSIc Area South"  $2 $3; yy=$? ;;
303          'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $3; yy=$? ;;          'AthSiN') testoutput_var $1 "thSI_Ice_Area_N" "thSIc Area North"  $2 $3; yy=$? ;;
# Line 484  makemodel() Line 492  makemodel()
492          cd $1;          cd $1;
493          if test -r Makefile ; then          if test -r Makefile ; then
494              printf 'make ... '              printf 'make ... '
495              if test "x$ADM" = xt ; then              $MAKE $TARG >> make.tr_log 2>&1
                 $MAKE adall >> make.tr_log 2>&1  
             elif test "x$OADM" = xt ; then  
                 $MAKE adAll >> make.tr_log 2>&1  
             else  
                 if test "x$JOBS" = x ; then  
                     $MAKE $TARG >> make.tr_log 2>&1  
                 else  
                     $MAKE -j $JOBS $TARG >> make.tr_log 2>&1  
                 fi  
             fi  
496              RETVAL=$?              RETVAL=$?
497              if test "x$RETVAL" != x0 ; then              if test "x$RETVAL" != x0 ; then
498                  tail make.tr_log                  tail make.tr_log
# Line 1115  fi Line 1113  fi
1113    
1114  #- setting for forward or ADM testing  #- setting for forward or ADM testing
1115  if test "x$ADM" = xt ; then  if test "x$ADM" = xt ; then
1116        if test "x$TARG" = xobj ; then TARG=adobj ; else TARG=adall ; fi
1117      code_dir=code_ad      code_dir=code_ad
1118      inputdir=input_ad      inputdir=input_ad
1119      ref_outp="output_adm.txt"      ref_outp="output_adm.txt"
1120      EXECUTABLE="mitgcmuv_ad"      EXECUTABLE="mitgcmuv_ad"
1121  elif test "x$OADM" = xt ; then  elif test "x$OADM" = xt ; then
1122        TARG=adAll
1123      code_dir=code_oad      code_dir=code_oad
1124      inputdir=input_oad      inputdir=input_oad
1125      ref_outp="output_oadm.txt"      ref_outp="output_oadm.txt"
1126      EXECUTABLE="mitgcmuv_ad"      EXECUTABLE="mitgcmuv_ad"
1127  else  else
1128        if test "x$JOBS" != x ; then TARG="-j $JOBS $TARG" ; fi
1129      code_dir=code      code_dir=code
1130      inputdir=input      inputdir=input
1131      ref_outp="output.txt"      ref_outp="output.txt"
# Line 1204  if test "x$ADM" = x -a "x$OADM" = x; the Line 1205  if test "x$ADM" = x -a "x$OADM" = x; the
1205      EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $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 "  ."}}'`
1206  else  else
1207      DEF_CHECK_LIST='AdGrd Cost AdGrd FDGrd'      DEF_CHECK_LIST='AdGrd Cost AdGrd FDGrd'
1208      EMPTY_RESULTS='.. ..'      EMPTY_RESULTS='.. .. ..'
1209      LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`      LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
1210  fi  fi
1211    
Legend:
Removed from v.1.167  
changed lines
  Added in v.1.170
  ViewVC Help
Powered by ViewVC 1.1.22