--- MITgcm/tools/genmake2	2015/04/15 15:49:12	1.271
+++ MITgcm/tools/genmake2	2015/07/03 21:33:55	1.272
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.271 2015/04/15 15:49:12 mlosch Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.272 2015/07/03 21:33:55 heimbach Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -1332,6 +1332,7 @@
 
 AUTODIFF_PKG_USED=f
 OPENAD=
+OPENAD_DIVA=
 AD_OPTFILE=
 CAT_SRC_FOR_TAF=1
 TAF=
@@ -1424,6 +1425,9 @@
 	-adoptfile=* | --adoptfile=* | -adof=* | --adof=*)
 	    AD_OPTFILE=$ac_optarg ;;
 
+	-diva | --diva)
+	    OPENAD_DIVA="ALLOW_OPENAD_DIVA=" ;;
+
 	-pdepend | --pdepend)
 	    ac_prev=PKG_DEPEND ;;
 	-pdepend=* | --pdepend=*)
@@ -2890,6 +2894,7 @@
 CC = ${CC}
 # Link editor
 LINK = ${LINK} ${LDADD}
+export $OPENAD_DIVA
 
 # Defines for CPP
 DEFINES = ${DEFINES}
@@ -3417,6 +3422,7 @@
 OAD_cp.F90 \
 OAD_rev.F90 \
 OAD_tape.F90 \
+OAD_regular_cp.F90 \
 revolve.F90
 
 OPENAD_SUPPORT_C_SRC_FILES = \