--- MITgcm/tools/genmake2	2015/02/24 17:34:54	1.270
+++ MITgcm/tools/genmake2	2016/01/12 20:43:00	1.277
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.270 2015/02/24 17:34:54 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.277 2016/01/12 20:43:00 jmc Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -1964,26 +1964,56 @@
 fi
 rm -f genmake_tcomp*
 
-printf "  Do we have the etime() command using $FC...  "
-cat > genmake_tcomp.$FS <<EOF
+printf "  Do we have the etime() command using $FC... "
+cat > genmake_tcomp_1.$FS <<EOF
       program hello
-      REAL*4 ACTUAL, TARRAY(2)
+      REAL*4 actual, tarray(2)
       EXTERNAL ETIME
       REAL*4 ETIME
-      actual = etime( tarray )
+      actual = ETIME( tarray )
       print *, tarray
       end
 EOF
-$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp_1 genmake_tcomp_1.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
-    HAVE_ETIME=t
-    DEFINES="$DEFINES -DHAVE_ETIME"
-    echo "yes"
+    HAVE_ETIME='Fct'
+    DEFINES="$DEFINES -DHAVE_ETIME_FCT"
+    echo " yes (${HAVE_ETIME})"
 else
+  cat > genmake_tcomp_2.$FS <<EOF
+      program hello
+      REAL*4 actual, tarray(2)
+      actual = -999.
+      call ETIME( tarray, actual )
+      if ( actual.ge.0. ) then
+        print *, 0, tarray, actual
+      else
+        print *, 1, tarray, actual
+      endif
+      end
+EOF
+  $FC $FFLAGS -o genmake_tcomp_2 genmake_tcomp_2.$FS >> genmake_tcomp.log 2>&1
+  RETVAL=$?
+  if test "x$RETVAL" = x0 ; then
+    echo -n 'c,'
+    ./genmake_tcomp_2 > genmake_tcomp_2.out 2>&1
+    RETVAL=$?
+  fi
+  if test "x$RETVAL" = x0 ; then
+    echo -n 'r:'
+    RETVAL=`cat genmake_tcomp_2.out | $AWK '{print $1}'`
+  fi
+  if test "x$RETVAL" = x0 ; then
+    HAVE_ETIME='SbR'
+    DEFINES="$DEFINES -DHAVE_ETIME_SBR"
+    echo " yes (${HAVE_ETIME})"
+  else
     HAVE_ETIME=
-    echo "no"
+    echo " no"
+  fi
 fi
+#mkdir chk_etime ; cp -p -f genmake_tcomp* chk_etime
 rm -f genmake_tcomp*
 
 printf "  Can we call simple C routines (here, \"cloc()\") using $FC...  "
@@ -2901,8 +2931,8 @@
 KFLAGS1 = ${KFLAGS1}
 KFLAGS2 = ${KFLAGS2}
 # Optim./debug for FC
-FFLAGS = ${FFLAGS} ${FEXTRAFLAGS}
-FOPTIM = ${FOPTIM}
+FFLAGS = ${FFLAGS}
+FOPTIM = ${FOPTIM} ${FEXTRAFLAGS}
 # Optim./debug for FC
 F90FLAGS = ${F90FLAGS}
 F90OPTIM = ${F90OPTIM}
@@ -3417,6 +3447,7 @@
 OAD_cp.F90 \
 OAD_rev.F90 \
 OAD_tape.F90 \
+OAD_regular_cp.F90 \
 revolve.F90
 
 OPENAD_SUPPORT_C_SRC_FILES = \