/[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.184 by jmc, Thu Jun 13 19:05:32 2013 UTC revision 1.191 by jmc, Thu Jul 25 00:42:41 2013 UTC
# Line 458  run_clean() Line 458  run_clean()
458      if test "x$NOCLEAN" = xt ; then      if test "x$NOCLEAN" = xt ; then
459          echo "run_clean skipped!"          echo "run_clean skipped!"
460      else      else
461          (        (
462              cd $1;          cd $1;
463              printf 'clean run-dir ... '          printf 'clean run-dir ... '
464              # part of what is done after "make clean" when doing "make CLEAN"          # part of what is done after "make clean" when doing "make CLEAN"
465              find . -name "*.meta" -exec rm {} \;          find . -name "*.meta" -exec rm {} \;
466              find . -name "*.data" -exec rm {} \;          find . -name "*.data" -exec rm {} \;
467              find . -name "fort.*" -exec rm {} \;          find . -name "fort.*" -exec rm {} \;
468              find . -type l -exec rm {} \;          find . -type l -exec rm {} \;
469              #- should remove executable only if sym-link (alredy done above)          #- should remove executable only if sym-link (already done above)
470              rm -f $RUNLOG *.txt STD* w2_tile_topology.????.log *diagnostics.log datetime          rm -f $RUNLOG *.txt STDOUT.* STDERR.* *diagnostics.log *.[0-9][0-9][0-9][0-9].log
471              rm -rf mnc_test_*          rm -f datetime costfinal divided.ctrl snapshot* output_adm.*.diva_*
472              rm -f *_MIT_CE_000.opt0000 costfunction*0000          rm -f *_MIT_CE_000.opt0000 costfunction*0000
473              echo successful          rm -f oad_cp.[0-9][0-9][0-9].?????
474              exit 0          rm -rf mnc_test_*
475          )          echo successful
476            exit 0
477          )
478      fi      fi
479  }  }
480    
# Line 538  makemodel() Line 540  makemodel()
540          fi          fi
541      fi      fi
542      if test $KIND = 1 -a -f taf_ftl.log ; then      if test $KIND = 1 -a -f taf_ftl.log ; then
543              head -1 taf_ftl.log >> $CDIR"/summary.txt"          head -1 taf_ftl.log >> $CDIR"/summary.txt"
544      fi      fi
545      if test $KIND = 2 -a -f taf_ad.log ; then      if test $KIND = 2 -a -f taf_ad.log ; then
546              head -1 taf_ad.log >> $CDIR"/summary.txt"          head -1 taf_ad.log >> $CDIR"/summary.txt"
547              nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`          nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log`
548              nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`          nwar=`grep -c 'TAF RECOMPUTATION *.* WARNING ' taf_ad.log`
549              echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \          if test -f taf_output ; then
550                n2er=`grep -c 'TAF *.* ERROR ' taf_output`
551                n3er=`grep -c '\*ERROR\* ' taf_output`
552                nerr=`expr $nerr + $n2er + $n3er`
553            fi
554            echo " TAF reports $nerr Errors and $nwar Recomputation Warnings" \
555                                  >> $CDIR"/summary.txt"                                  >> $CDIR"/summary.txt"
556      fi      fi
557      if test $mk_fail != 0 ; then return $mk_fail ; fi      if test $mk_fail != 0 ; then return $mk_fail ; fi
# Line 791  runmodel() Line 798  runmodel()
798              # output do not exist or is older than executable:              # output do not exist or is older than executable:
799              rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG              rm -f $OUTPUTFILE $RUNLOG ; touch $RUNLOG
800              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
801            #- Divided Adjoint Run:
802            #  get the number of additional runs (add_DIVA_runs) from file "run_ADM_DIVA"
803                if test $KIND = 2 -a -f run_ADM_DIVA ; then
804                  adm_diva_nb=`sed -n '/^ *add_DIVA_runs\>.*=/p' run_ADM_DIVA | sed 's/ //g'`
805                  echo " Divided Adjoint Run: $adm_diva_nb" >> $RUNLOG
806                  eval "let $adm_diva_nb"
807                  if [ $add_DIVA_runs -ge 1 ] ; then
808                    rm -f costf* divided.ctrl snapshot*
809                    echo -n "(add_DIVA_runs=$add_DIVA_runs) ... "
810                    for ii in `seq 1 $add_DIVA_runs` ; do
811                      ( eval $COMMAND ) >> $RUNLOG 2>&1
812                      echo " additional DIVA run # $ii : done" >> $RUNLOG
813                      mv -f $OUTPUTFILE ${OUTPUTFILE}.diva_${ii}
814                    done
815                  fi
816                fi
817            #- special DIVA processing ends here
818              ( eval $COMMAND ) >> $RUNLOG 2>&1              ( eval $COMMAND ) >> $RUNLOG 2>&1
819              RETVAL=$?              RETVAL=$?
820              ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`              ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`
# Line 915  formatresults() Line 939  formatresults()
939          fi          fi
940      fi      fi
941      printf '  %s' $nm      printf '  %s' $nm
942        if test $KIND = 2 ; then
943            #-- apppend taf repport summary:
944            tafrep=`grep -c '^ TAF reports ' $CDIR/summary.txt`
945            if test $tafrep = 1 ; then
946                grep '^ TAF reports ' $CDIR/summary.txt | awk '{printf "  (e=%i, w=%i)",$3,$6}'
947            fi
948        fi
949      printf '\n'      printf '\n'
950    
951  }  }
# Line 1432  for dir in $TESTDIRS ; do Line 1463  for dir in $TESTDIRS ; do
1463              rm -f $EXECUTABLE *.bak              rm -f $EXECUTABLE *.bak
1464              rm -f genmake_state genmake_*optfile genmake.log              rm -f genmake_state genmake_*optfile genmake.log
1465              rm -f SIZE.h.mpi genmake.tr_log make.tr_log              rm -f SIZE.h.mpi genmake.tr_log make.tr_log
1466                rm -rf mpi_headers
1467          )          )
1468          if test -d $dir/$rundir/CVS ; then          if test -d $dir/$rundir/CVS ; then
1469              echo -n '  --- dir:' $dir/$rundir ': '              echo -n '  --- dir:' $dir/$rundir ': '
# Line 1606  for dir in $TESTDIRS ; do Line 1638  for dir in $TESTDIRS ; do
1638              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir              linkdata $dir/$pfxdir.$ex $inputdir.$ex $inputdir
1639              runmodel $dir/$pfxdir.$ex && run=Y \              runmodel $dir/$pfxdir.$ex && run=Y \
1640              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`              && results=`testoutput_run $dir $pfxdir.$ex $refExOut`
1641              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"  
1642              echo 1>&2              echo 1>&2
1643              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY              echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
1644              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.184  
changed lines
  Added in v.1.191
  ViewVC Help
Powered by ViewVC 1.1.22