/[MITgcm]/MITgcm/verification/testreport

Diff of /MITgcm/verification/testreport

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.201 by jmc,
Mon Feb 23 23:05:57 2015 UTC
+revision 1.204 by jmc,
Fri Nov 20 19:47:46 2015 UTC
 Line 42 
 usage()
      echo "  (-bash|-b) STRING        preferred location of a \"bash\" or \"sh\" shell"
      echo "                             (DEF=\"\" for \"bash\")"
      echo "  (-ef) STRING             used as genmake2 \"-extra_flag\" argument"
-     echo "  (-ncad)                  used genmake2 option \"-nocat4ad\" (-ncad)"
+     echo "  (-ncad)                  use genmake2 option \"-nocat4ad\" (-ncad)"
+     echo "  (-small_f)               make target small_f before making target all"
      echo "  (-makedepend|-md) STRING command to use for \"makedepend\""
      echo "  (-make|-m) STRING        command to use for \"make\""
      echo "                             (DEF=\"make\")"
-Line 131 
 testoutput_var()
+Line 132 
 testoutput_var()
          echo testoutput_var: grep "$2" $1/$4/$OUTPUTFILE 1>&2
      fi
      if [ -r $1/$4/$OUTPUTFILE ]; then
-         grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | cat -n > ${TMP}a.txt
+         grep "$2" $1/$4/$OUTPUTFILE | sed 's/.*=//' | nl > ${TMP}a.txt
          lncntA=`wc -l ${TMP}a.txt | awk '{print $1}' `
          if [ $lncntA -lt 2 ]; then
              if [ $verbose -gt 0 ]; then
-Line 146 
 testoutput_var()
+Line 147 
 testoutput_var()
      if [ $debug -gt 0 ]; then
          echo testoutput_var: grep "$2" $1/$5 1>&2
      fi
-     grep "$2" $1/$5 | sed 's/.*=//' | cat -n > ${TMP}b.txt
+     grep "$2" $1/$5 | sed 's/.*=//' | nl > ${TMP}b.txt
      lncntB=`wc -l ${TMP}b.txt | awk '{print $1}' `
      if [ $lncntB -lt 2 ]; then
          if [ $verbose -gt 0 ]; then
-Line 527 
 makemodel()
+Line 528 
 makemodel()
      else
          cd $1;
          if test -r Makefile ; then
+             if test "x$MKSMALLF" = xt ; then
+                 printf 'make small_f ... '
+                 $MAKE_CMD small_f >> make.tr_log 2>&1
+                 RETVAL=$?
+                 if test "x$RETVAL" != x0 ; then
+                     tail make.tr_log
+                     echo failed
+                     cp genmake.log genmake.tr_log $CDIR
+                     tail -$NBLINES_MKLOG make.tr_log > $CDIR"/make.tr_log_tail"
+                     rm -f $EXECUTABLE
+                     mk_fail=1
+                 else
+                     echo successful
+                 fi
+             fi
              printf 'make ... '
              $MAKE_CMD $TARG >> make.tr_log 2>&1
              RETVAL=$?
-Line 842 
 runmodel()
+Line 858 
 runmodel()
          if test -f $OUTPUTFILE ; then
            grep '(PID\.TID 0000\.0001)      n.. =' $OUTPUTFILE \
                  | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
-           grep -A3 'Seconds in section "ALL' $OUTPUTFILE \
+ #         grep -A3 'Seconds in section "ALL' $OUTPUTFILE \
-                 | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
+ #               | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
+ #         some implementations of grep cannot do contextual searches so we
+ #         replace the above with a sed command
+           cat $OUTPUTFILE | sed -n '/Seconds in section "ALL/{N
+           N
+           N
+           p
+           }' | sed 's/(PID.TID 0000.0001)   //' >> $CDIR"/summary.txt"
          fi
          if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi
          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
-Line 1058 
 DELDIR=
+Line 1081 
 DELDIR=
  USE_R4=
  EXTRFLG=
  NOCATAD=
+ MKSMALLF=
  #- type of testing (KIND):
  #   KIND=0 : forward (= default) ;  KIND=1 : Tangent Linear with TAF ;
-Line 1167 
 for ac_option ; do
+Line 1191 
 for ac_option ; do
                  echo "Error: '-tlm', '-adm' and '-oad' are exclusive" ; usage
                fi ;;
          -ncad) NOCATAD=t ;;
+         -small_f) MKSMALLF=t ;;
          -ieee)   echo "Warning: ignore option '-ieee' (already the default)"
                   printf " ... " ;;
-Line 1684 
 for dir in $TESTDIRS ; do
+Line 1709 
 for dir in $TESTDIRS ; do
  #           sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
  # bsd-sed cannot do the above code
              cat $dir/$builddir/Makefile | \
-                 sed  -n '/^# executed by:/{N
+                 sed -n '/^# executed by:/{N
-                                            p
+                                           p
-                                            }' >> $DRESULTS/genmake_state
+                                           }' >> $DRESULTS/genmake_state
              echo " $mkOpt" >> $DRESULTS/genmake_state
              if test "x$OPTFILE" = xNONE ; then
                  eval $mkOpt
-Line 1715 
 for dir in $TESTDIRS ; do
+Line 1740 
 for dir in $TESTDIRS ; do
                                           >> $DRESULTS/genmake_state
                    rm -f tmp.tr_log
                  fi
-                 echo -n "from '$gmkLog', " >> $DRESULTS/genmake_state
+             fi
-                 echo "get NETCDF & LAPACK settings:" >> $DRESULTS/genmake_state
+             gmkLog=$dir/$builddir/genmake_state
-                 sed -n '/set HAVE_NETCDF=/p' $gmkLog >> $DRESULTS/genmake_state
+             if test -r $gmkLog ; then
-                 sed -n '/set HAVE_LAPACK=/p' $gmkLog >> $DRESULTS/genmake_state
+                 echo -n "from '$gmkLog', "      >> $DRESULTS/genmake_state
+                 echo "get genmake settings:"    >> $DRESULTS/genmake_state
+                 sed -n '/^HAVE_/p' $gmkLog | sed 's/^./ &/' \
+                                                 >> $DRESULTS/genmake_state
              fi
          fi
      fi

 Legend:



Removed from v.1.201
 


changed lines


 
Added in v.1.204
 Legend:



Removed from v.1.201
 


changed lines


 
Added in v.1.204
-Removed from v.1.201
+Added in v.1.204

	ViewVC Help
Powered by ViewVC 1.1.22