/[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.185 by jmc, Sun Jul 7 00:33:19 2013 UTC revision 1.188 by jmc, Fri Jul 19 18:49:33 2013 UTC
# Line 539  makemodel() Line 539  makemodel()
539          fi          fi
540      fi      fi
541      if test $KIND = 1 -a -f taf_ftl.log ; then      if test $KIND = 1 -a -f taf_ftl.log ; then
542              head -1 taf_ftl.log >> $CDIR"/summary.txt"          head -1 taf_ftl.log >> $CDIR"/summary.txt"
543      fi      fi
544      if test $KIND = 2 -a -f taf_ad.log ; then      if test $KIND = 2 -a -f taf_ad.log ; then
545              head -1 taf_ad.log >> $CDIR"/summary.txt"          head -1 taf_ad.log >> $CDIR"/summary.txt"
546              nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`          nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`
547              nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`          nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`
548              echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \          if test -f taf_output ; then
549                n2er=`grep -c 'TAF *.* ERROR ' taf_output`
550                nerr=`expr $nerr + $n2er`
551            fi
552            echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \
553                                  >> $CDIR"/summary.txt"                                  >> $CDIR"/summary.txt"
554      fi      fi
555      if test $mk_fail != 0 ; then return $mk_fail ; fi      if test $mk_fail != 0 ; then return $mk_fail ; fi
# Line 792  runmodel() Line 796  runmodel()
796              # output do not exist or is older than executable:              # output do not exist or is older than executable:
797              rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG              rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG
798              if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi              if test -f run.log_tmp ; then cat run.log_tmp >> $RUNLOG ; fi
799            #- Divided Adjoint Run:
800            #  get the number of additional runs (add_DIVA_runs) from file "run_ADM_DIVA"
801                if test $KIND = 2 -a -f run_ADM_DIVA ; then
802                  adm_diva_nb=`sed -n '/^ *add_DIVA_runs\>.*=/p' run_ADM_DIVA | sed 's/ //g'`
803                  echo " Divided Adjoint Run: $adm_diva_nb" >> $RUNLOG
804                  eval "let $adm_diva_nb"
805                  if [ $add_DIVA_runs -ge 1 ] ; then
806                    rm -f costf* divided.ctrl snapshot*
807                    echo -n "(add_DIVA_runs=$add_DIVA_runs) ... "
808                    for ii in `seq 1 $add_DIVA_runs` ; do
809                      ( eval $COMMAND ) >> $RUNLOG 2>&1
810                      echo " additional DIVA run # $ii : done" >> $RUNLOG
811                      mv -f $OUTPUTFILE ${OUTPUTFILE}.diva_${ii}
812                    done
813                  fi
814                fi
815            #- special DIVA processing ends here
816              ( eval $COMMAND ) >> $RUNLOG 2>&1              ( eval $COMMAND ) >> $RUNLOG 2>&1
817              RETVAL=$?              RETVAL=$?
818              ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`              ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`
# Line 916  formatresults() Line 937  formatresults()
937          fi          fi
938      fi      fi
939      printf '  %s' $nm      printf '  %s' $nm
940        if test $KIND = 2 ; then
941            #-- apppend taf repport summary:
942            tafrep=`grep -c '^ TAF reports ' $CDIR/summary.txt`
943            if test $tafrep = 1 ; then
944                grep '^ TAF reports ' $CDIR/summary.txt | awk '{printf "  (e=%i, w=%i)",$3,$6}'
945            fi
946        fi
947      printf '\n'      printf '\n'
948    
949  }  }
# Line 1607  for dir in $TESTDIRS ; do Line 1635  for dir in $TESTDIRS ; do
1635              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir
1636              runmodel $dir/$pfxdir.$ex && run=Y \              runmodel $dir/$pfxdir.$ex && run=Y \
1637              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`
1638              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir.$ex ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
             fres="$fres.$ex"  
1639              echo 1>&2              echo 1>&2
1640              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1641              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"              echo "fresults='$fres'" | sed 's/ 99/ --/g' >> $locDIR"/summary.txt"
Legend:
Removed from v.1.185  
changed lines
  Added in v.1.188
  ViewVC Help
Powered by ViewVC 1.1.22