--- MITgcm/tools/genmake2	2015/07/03 21:33:55	1.272
+++ MITgcm/tools/genmake2	2015/11/20 01:22:36	1.274
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.272 2015/07/03 21:33:55 heimbach Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.274 2015/11/20 01:22:36 jmc Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -1332,7 +1332,6 @@
 
 AUTODIFF_PKG_USED=f
 OPENAD=
-OPENAD_DIVA=
 AD_OPTFILE=
 CAT_SRC_FOR_TAF=1
 TAF=
@@ -1425,9 +1424,6 @@
 	-adoptfile=* | --adoptfile=* | -adof=* | --adof=*)
 	    AD_OPTFILE=$ac_optarg ;;
 
-	-diva | --diva)
-	    OPENAD_DIVA="ALLOW_OPENAD_DIVA=" ;;
-
 	-pdepend | --pdepend)
 	    ac_prev=PKG_DEPEND ;;
 	-pdepend=* | --pdepend=*)
@@ -1972,9 +1968,7 @@
 cat > genmake_tcomp.$FS <<EOF
       program hello
       REAL*4 ACTUAL, TARRAY(2)
-      EXTERNAL ETIME
-      REAL*4 ETIME
-      actual = etime( tarray )
+      call etime( tarray, actual )
       print *, tarray
       end
 EOF
@@ -2894,7 +2888,6 @@
 CC = ${CC}
 # Link editor
 LINK = ${LINK} ${LDADD}
-export $OPENAD_DIVA
 
 # Defines for CPP
 DEFINES = ${DEFINES}