--- MITgcm/tools/genmake2	2015/02/19 20:48:43	1.269
+++ MITgcm/tools/genmake2	2016/01/07 20:21:42	1.276
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.269 2015/02/19 20:48:43 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.276 2016/01/07 20:21:42 jmc Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -1590,7 +1590,7 @@
 
 #TMP=./genmk_$$
 #- try to put temporary files in system-local /tmp dir
-TMP=/tmp/genmk_$$
+TMP=/tmp/genmk_${USER}_$$
 touch $TMP ; retVal=$?
 if [ $retVal -eq 0 ] ; then
   if test ! -r $TMP ; then TMP=./genmk_$$ ; fi
@@ -1964,26 +1964,39 @@
 fi
 rm -f genmake_tcomp*
 
-printf "  Do we have the etime() command using $FC...  "
+printf "  Do we have the etime() command using $FC... "
 cat > genmake_tcomp.$FS <<EOF
       program hello
-      REAL*4 ACTUAL, TARRAY(2)
-      EXTERNAL ETIME
-      REAL*4 ETIME
-      actual = etime( tarray )
-      print *, tarray
+      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 genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
+    echo -n 'c,'
+    ./genmake_tcomp > genmake_tcomp.out 2>&1
+    RETVAL=$?
+fi
+if test "x$RETVAL" = x0 ; then
+    echo -n 'r:'
+    RETVAL=`cat genmake_tcomp.out | $AWK '{print $1}'`
+fi
+if test "x$RETVAL" = x0 ; then
     HAVE_ETIME=t
     DEFINES="$DEFINES -DHAVE_ETIME"
-    echo "yes"
+    echo " yes"
 else
     HAVE_ETIME=
-    echo "no"
+    echo " no"
 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 +2914,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}
@@ -3205,13 +3218,14 @@
 	\$(MAKE) -f \$(MAKEFILE) remove_comments
 	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) \$(FLOWFILES) \$(AD_FILES)
 	\$(MAKE) -f \$(MAKEFILE) adj_sed
-	\$(MAKE) -f \$(MAKEFILE) adobjfiles
 	cat \$(AD_FILES:.$FS=_ad.$FS) > ad_taf_output.$FS
 
 \$(EXE_AD): \$(SPECIAL_FILES) \$(H_SRC_FILES) ad_taf_output.$FS \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
+	\$(MAKE) -f \$(MAKEFILE) adobjfiles
 	\$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(AD_FILES:.$FS=_ad.o) \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
 
-adobj: \$(AD_FILES:.$FS=_ad.o) \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o)
+adobj: ad_taf_output.$FS \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o)
+	\$(MAKE) -f \$(MAKEFILE) adobjfiles
 
 EOF
 fi
@@ -3284,10 +3298,10 @@
 	\$(MAKE) -f \$(MAKEFILE) remove_comments
 	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) \$(AD_FLOW_FILES) \$(AD_FILES)
 	\$(MAKE) -f \$(MAKEFILE) ftl_sed
-	\$(MAKE) -f \$(MAKEFILE) ftlobjfiles
 	cat \$(AD_FILES:.$FS=_tl.$FS) > ftl_taf_output.$FS
 
 \$(EXE_FTL): \$(SPECIAL_FILES) \$(H_SRC_FILES) ftl_taf_output.$FS \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
+	\$(MAKE) -f \$(MAKEFILE) ftlobjfiles
 	\$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(AD_FILES:.$FS=_tl.o) \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
 
 EOF
@@ -3416,6 +3430,7 @@
 OAD_cp.F90 \
 OAD_rev.F90 \
 OAD_tape.F90 \
+OAD_regular_cp.F90 \
 revolve.F90
 
 OPENAD_SUPPORT_C_SRC_FILES = \