--- MITgcm/tools/genmake2	2010/11/04 18:01:22	1.212
+++ MITgcm/tools/genmake2	2014/01/06 16:49:10	1.263
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.212 2010/11/04 18:01:22 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.263 2014/01/06 16:49:10 jahn Exp $
+# $Name:  $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -8,33 +9,183 @@
 #   modified by aja 01/00
 #   rewritten in bash by eh3 08/03
 
+#  Explain usage
+usage()  {
+cat <<EOF
+
+Usage: "$0" [OPTIONS]
+  where [OPTIONS] can be:
+
+    -help | --help | -h | --h
+	  Print this help message and exit.
+
+    -adoptfile NAME | --adoptfile NAME | -adof NAME | --adof NAME
+      -adoptfile=NAME | --adoptfile=NAME | -adof=NAME | --adof=NAME
+	  Use "NAME" as the adoptfile.  By default, the file at
+	  "tools/adjoint_options/adjoint_default" will be used.
+
+    -nooptfile | --nooptfile
+      -optfile NAME | --optfile NAME | -of NAME | --of NAME
+      -optfile=NAME | --optfile=NAME | -of=NAME | --of=NAME
+	  Use "NAME" as the optfile.  By default, an attempt will be
+	  made to find an appropriate "standard" optfile in the
+	  tools/build_options/ directory.
+
+    -pdepend NAME | --pdepend NAME
+      -pdepend=NAME | --pdepend=NAME
+	  Get package dependency information from "NAME".
+
+    -pgroups NAME | --pgroups NAME
+      -pgroups=NAME | --pgroups=NAME
+	  Get the package groups information from "NAME".
+
+    -bash NAME
+	  Explicitly specify the Bourne or BASH shell to use
+
+    -make NAME | -m NAME
+      --make=NAME | -m=NAME
+	  Use "NAME" for the MAKE program. The default is "make" but
+	  many platforms, "gmake" is the preferred choice.
+
+    -makefile NAME | -mf NAME
+      --makefile=NAME | -mf=NAME
+	  Call the makefile "NAME".  The default is "Makefile".
+
+    -makedepend NAME | -md NAME
+      --makedepend=NAME | -md=NAME
+	  Use "NAME" for the MAKEDEPEND program.
+
+    -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME
+      -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME
+	  Specify the location of the MITgcm ROOTDIR as "NAME".
+	  By default, genamke will try to find the location by
+	  looking in parent directories (up to the 5th parent).
+
+    -mods NAME | --mods NAME | -mo NAME | --mo NAME
+      -mods=NAME | --mods=NAME | -mo=NAME | --mo=NAME
+	  Here, "NAME" specifies a list of directories that are
+	  used for additional source code.  Files found in the
+	  "mods list" are given preference over files of the same
+	  name found elsewhere.
+
+    -disable NAME | --disable NAME
+      -disable=NAME | --disable=NAME
+	  Here "NAME" specifies a list of packages that we don't
+	  want to use.  If this violates package dependencies,
+	  genamke will exit with an error message.
+
+    -enable NAME | --enable NAME
+      -enable=NAME | --enable=NAME
+	  Here "NAME" specifies a list of packages that we wish
+	  to specifically enable.  If this violates package
+	  dependencies, genamke will exit with an error message.
+
+    -standarddirs NAME | --standarddirs NAME
+      -standarddirs=NAME | --standarddirs=NAME
+	  Here, "NAME" specifies a list of directories to be
+	  used as the "standard" code.
+
+    -fortran NAME | --fortran NAME | -fc NAME | --fc NAME
+      -fc=NAME | --fc=NAME
+	  Use "NAME" as the fortran compiler.  By default, genmake
+	  will search for a working compiler by trying a list of
+	  "usual suspects" such as g77, f77, etc.
+
+    -cc NAME | --cc NAME | -cc=NAME | --cc=NAME
+	  Use "NAME" as the C compiler.  By default, genmake
+	  will search for a working compiler by trying a list of
+	  "usual suspects" such as gcc, c89, cc, etc.
+
+    -use_real4 | -use_r4 | -ur4 | --use_real4 | --use_r4 | --ur4
+	  Use "real*4" type for _RS variable (#undef REAL4_IS_SLOW)
+	  *only* works if CPP_EEOPTIONS.h allows this.
+
+    -ignoretime | -ignore_time | --ignoretime | --ignore_time
+	  Ignore all the "wall clock" routines entirely.  This will
+	  not in any way hurt the model results -- it simply means
+	  that the code that checks how long the model spends in
+	  various routines will give junk values.
+
+    -ts | --ts
+	  Produce timing information per timestep
+    -papis | --papis
+	  Produce summary MFlop/s (and IPC) with PAPI per timestep
+    -pcls | --pcls
+	  Produce summary MFlop/s etc. with PCL per timestep
+    -foolad | --foolad
+	  Fool the AD code generator
+    -papi | --papi
+	  Performance analysis with PAPI
+    -pcl | --pcl
+	  Performance analysis with PCL
+    -hpmt | --hpmt
+	  Performance analysis with the HPM Toolkit
+
+    -ieee | --ieee
+	  use IEEE numerics.  Note that this option *only* works
+	  if it is supported by the OPTFILE that is being used.
+    -devel | --devel
+	  Add additional warning and debugging flags for development
+	  (if supported by the OPTFILE); also switch to IEEE numerics.
+    -gsl | --gsl
+	  Use GSL to control floating point rounding and precision
+
+    -mpi | --mpi
+	  Include MPI header files and link to MPI libraries
+    -mpi=PATH | --mpi=PATH
+	  Include MPI header files and link to MPI libraries using MPI_ROOT
+	  set to PATH. i.e. Include files from \$PATH/include, link to libraries
+	  from \$PATH/lib and use binaries from \$PATH/bin.
+
+    -omp | --omp
+	  Activate OpenMP code + use Compiler option OMPFLAG
+    -omp=OMPFLAG | --omp=OMPFLAG
+	  Activate OpenMP code + use Compiler option OMPFLAG
+
+    -es | --es | -embed-source | --embed-source
+	  Embed a tarball containing the full source code
+	  (including the Makefile, etc.) used to build the
+	  executable [off by default]
+
+    -ds | --ds
+	  Report genmake internal variables status (DUMPSTATE)
+	  to file "genmake_state" (for debug purpose)
+
+  While it is most often a single word, the "NAME" variables specified
+  above can in many cases be a space-delimited string such as:
+
+    --enable pkg1   --enable 'pkg1 pkg2'   --enable 'pkg1 pkg2 pkg3'
+    -mods=dir1   -mods='dir1'   -mods='dir1 dir2 dir3'
+    -foptim='-Mvect=cachesize:512000,transform -xtypemap=real:64,double:64,integer:32'
+
+  which, depending upon your shell, may need to be single-quoted.
+
+  For more detailed genmake documentation, please see:
+
+    http://mitgcm.org/public/devel_HOWTO/
+
+EOF
+
+    exit 1
+}
+
 # Search for particular CPP #cmds associated with packages
 # usage: test_for_package_in_cpp_options CPP_file package_name
 test_for_package_in_cpp_options() {
     cpp_options=$1
     pkg=$2
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg$"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg$"
-    test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg$"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg$"
+    test_for_string_in_file $cpp_options "^ *# *define *\<ALLOW_$pkg\>"
+    test_for_string_in_file $cpp_options "^ *# *undef *\<ALLOW_$pkg\>"
+    test_for_string_in_file $cpp_options "^ *# *define *\<DISABLE_$pkg\>"
+    test_for_string_in_file $cpp_options "^ *# *undef *\<DISABLE_$pkg\>"
 }
 
 # Search for particular CPP #cmds associated with MPI
 # usage: test_for_mpi_in_cpp_eeoptions CPP_file
 test_for_mpi_in_cpp_eeoptions() {
     cpp_options=$1
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI[ ]"
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_USE_MPI$"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI$"
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI$"
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI$"
+    test_for_string_in_file $cpp_options "^ *# *define *\<ALLOW_USE_MPI\>"
+    test_for_string_in_file $cpp_options "^ *# *undef *\<ALLOW_USE_MPI\>"
 }
 
 # Search for particular string in a file. Return 1 if detected, 0 if not
@@ -42,11 +193,11 @@
 test_for_string_in_file() {
     file=$1
     strng=$2
-    grep -i "$strng" $file > /dev/null 2>&1
+    grep "$strng" $file > /dev/null 2>&1
     RETVAL=$?
     if test "x${RETVAL}" = x0 ; then
 	printf "Error: In $file there is an illegal line: "
-        grep -i "$strng" $file
+	grep -i "$strng" $file
 	exit 99
     fi
     return 0
@@ -57,11 +208,11 @@
 expand_pkg_groups() {
     new_packages=
     if test -r $PKG_GROUPS ; then
-	cat $PKG_GROUPS | sed -e 's/#.*$//g' | sed -e 's/:/ : /g' > ./p1.tmp
-	cat ./p1.tmp | $AWK '(NF>2 && $2==":"){ print $0 }' > ./p2.tmp
+	cat $PKG_GROUPS | sed -e 's/#.*$//g' | sed -e 's/:/ : /g' > $TMP.p1
+	cat $TMP.p1 | $AWK '(NF>2 && $2==":"){ print $0 }' > $TMP.p2
 	matched=0
 	for i in $PACKAGES ; do
-	    line=`grep "^ *$i" ./p2.tmp`
+	    line=`grep "^ *$i" $TMP.p2`
 	    RETVAL=$?
 	    if test "x$RETVAL" = x0 ; then
 		matched=1
@@ -73,7 +224,7 @@
 	    fi
 	done
 	PACKAGES=$new_packages
-	rm -f ./p[1,2].tmp
+	rm -f $TMP.p[1,2]
 	return $matched
     else
 	echo "Warning: can't read package groups definition file: $PKG_GROUPS"
@@ -136,7 +287,7 @@
 .F.$tfs:
 	$LN \$< \$@
 EOF
-    $MAKE "genmake_hello."$tfs > /dev/null 2>&1
+    $MAKE -f $MAKEFILE "genmake_hello."$tfs > /dev/null 2>&1
     RETVAL=$?
     if test "x$RETVAL" != x0 -o ! -f "genmake_hello."$tfs ; then
 	if test "x$FS" = x ; then
@@ -144,13 +295,12 @@
 	    FS90='fr9'
 	    check_for_broken_Ff
 	else
-	    cat <<EOF 2>&1
-ERROR: Your file system cannot distinguish between *.F and *.f files
-  (fails the "make/ln" test) and this program cannot find a suitable
-  replacement extension.  Please try a different build environment or
-  contact the <MITgcm-support@mitgcm.org> list for help.
-
-EOF
+	    echo "ERROR: test: '$MAKE -f $MAKEFILE genmake_hello.$tfs' Failed"
+	    echo "       see simple makefile: '$MAKEFILE' (left here)"
+	    echo "  Please check (1) your '$MAKE' command, (2) your '$LN' command"
+	    echo "           and (3) the allowed sufix '.F' and '.$tfs' in makefile"
+	    echo "  or contact the <MITgcm-support@mitgcm.org> list for help."
+	    echo ""
 	    exit -1
 	    return
 	fi
@@ -164,7 +314,6 @@
     return
 }
 
-
 look_for_makedepend()  {
 
     #  The "original" makedepend is part of the Imake system that is
@@ -175,19 +324,37 @@
     #
     #    1) a makedepend implementation shipped with the cyrus-imapd
     #       package:  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
-    #
-    #    2) a known-buggy xmakedpend shell script
+    #    2) a local tools/xmakedepend shell script
     #
     #  So the choices are, in order:
-    #
     #    1) use the user-specified program
-    #    2) use a system-wide default
-    #    3) locally build and use the cyrus implementation
-    #    4) fall back to the buggy local xmakedpend script
+    #    2) use the local xmakedepend script (get all dependencies, but slower)
+    #    3) use a system-wide default
+    #    4) locally build and use the cyrus makedepend
+    #             (faster, but can miss some dependencies)
     #
+    echo >> $LOGFILE
+    echo "running: look_for_makedepend()" >> $LOGFILE
+    if test "x${MAKEDEPEND}" != x ; then
+	echo "${MAKEDEPEND}" | grep -i cyrus > /dev/null 2>&1
+	RETVAL=$?
+	if test x"$RETVAL" = x0 ; then
+	    build_cyrus_makedepend
+	    RETVAL=$?
+	    if test "x$RETVAL" != x0 ; then
+		echo "WARNING: unable to build cyrus-makedepend. Try other 'makedepend'"
+		MAKEDEPEND=
+	    fi
+	else
+	    echo "${MAKEDEPEND}" | grep 'tools.xmakedepend' > /dev/null 2>&1
+	    RETVAL=$?
+	    if test "x$RETVAL" = x0 ; then
+		MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
+	    fi
+	    echo " -->     MAKEDEPEND=${MAKEDEPEND}" >> $LOGFILE
+	fi
+    fi
     if test "x${MAKEDEPEND}" = x ; then
-	which makedepend > /dev/null 2>&1
-	RV0=$?
 	test -f $MAKEFILE  &&  mv -f $MAKEFILE $MAKEFILE".tst"
 	#  echo 'MAKEFILE="'$MAKEFILE'"'
 	cat <<EOF >> $MAKEFILE
@@ -203,40 +370,52 @@
       stop
       end
 EOF
-	makedepend genmake_tc.f > /dev/null 2>&1
+	$ROOTDIR/tools/xmakedepend -f $MAKEFILE genmake_tc.f > /dev/null 2>&1
 	RV1=$?
+	which makedepend > /dev/null 2>&1
+	RV2=$?
+	if test "x${RV2}" = x0 ; then
+	    makedepend -f $MAKEFILE genmake_tc.f > /dev/null 2>&1
+	    RV3=$? ; loc_msg='not working.'
+	else RV3=$RV2 ; loc_msg='not found.'
+	fi
 	test -f $MAKEFILE  &&  rm -f $MAKEFILE
 	test -f $MAKEFILE".tst"  &&  mv -f $MAKEFILE".tst" $MAKEFILE
-	if test "x${RV0}${RV1}" = x00 ; then
+	echo "  check makedepend (local: $RV1, system: $RV2, $RV3)"
+	if test "x${RV1}" = x0 ; then
+	    MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
+	    echo " --> set MAKEDEPEND=${MAKEDEPEND}" >> $LOGFILE
+	elif test "x${RV3}" = x0 ; then
+	    echo "    local tools/xmakedepend not working. Use system-default makedepend"
 	    MAKEDEPEND=makedepend
+	    echo " --> set MAKEDEPEND=${MAKEDEPEND}" >> $LOGFILE
 	else
-	    echo "    a system-default makedepend was not found."
-
+	    echo "    local tools/xmakedepend not working; system-default makedepend $loc_msg"
+	    echo -n "    Try to build cyrus-makedepend ..."
 	    #  Try to build the cyrus implementation
 	    build_cyrus_makedepend
 	    RETVAL=$?
-	    if test "x$RETVAL" != x0 ; then
-		MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
+	    if test "x$RETVAL" = x0 ; then
+		echo "  Works"
+	    else
+		echo "  Fails" ; echo "" >> $LOGFILE
+		echo "ERROR: no working makedepend found ; look_for_makedepend FAILED" | tee -a $LOGFILE
+		echo ""
+		exit -1
+		return
 	    fi
-	    rm -f ./genmake_cy_md
-	fi
-    else
-	#  echo "MAKEDEPEND=${MAKEDEPEND}"
-	echo "${MAKEDEPEND}" | grep -i cyrus > /dev/null 2>&1
-	RETVAL=$?
-	if test x"$RETVAL" = x0 ; then
-	    build_cyrus_makedepend
 	fi
     fi
 }
 
-
 build_cyrus_makedepend()  {
+    echo >> $LOGFILE
+    echo "running: build_cyrus_makedepend()" >> $LOGFILE
     rm -f ./genmake_cy_md
     (
 	cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
 	    &&  ./configure > /dev/null 2>&1  \
-	    &&  make > /dev/null 2>&1
+	    &&  $MAKE > /dev/null 2>&1
 	if test -x ./makedepend.exe ; then
 	    $LN ./makedepend.exe ./makedepend
 	fi
@@ -248,25 +427,25 @@
     rm -f ./genmake_cy_md
     if test "x$RETVAL" = x0 ; then
 	MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
+ 	echo " --> set MAKEDEPEND=${MAKEDEPEND}" >> $LOGFILE
 	return 0
     else
-	echo "WARNING: unable to build cyrus-imapd-makedepend"
+	echo "WARNING: fail to build cyrus-imapd-makedepend" >> $LOGFILE
 	return 1
     fi
 }
 
-
 build_embed_encode()
 {
     printf "  building the embed-encode utility...  "
     if test ! -e "$ROOTDIR/tools/embed_encode/encode_files" ; then
-        if test ! -d "$ROOTDIR/tools/embed_encode" ; then
-            echo
-            echo "    Error: can't locate \"$ROOTDIR/tools/embed_encode\""
-            echo
-            EMBED_SRC=f
+	if test ! -d "$ROOTDIR/tools/embed_encode" ; then
+	    echo
+	    echo "    Error: can't locate \"$ROOTDIR/tools/embed_encode\""
+	    echo
+	    EMBED_SRC=f
 	    return 1
-        fi
+	fi
 	clist="cc gcc c89 $CC"
 	for ic in $clist ; do
 	    comm="$ic -o encode_files encode_files.c"
@@ -274,7 +453,6 @@
 	    RETVAL=$?
 	    if test "x$RETVAL" = x0 ; then
 		echo "OK"
-		DEFINES="$DEFINES -DHAVE_EMBED_SRC"
 		return 0
 	    fi
 	done
@@ -286,26 +464,29 @@
 	return 1
     fi
     echo "OK"
-    DEFINES="$DEFINES -DHAVE_EMBED_SRC"
 }
 
-
 #  look for possible C compilers
 look_for_C_compilers() {
-    tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc icc"
-    p_CC=
-    for c in $tmp ; do
-	rm -f ./genmake_hello.c  ./genmake_hello
-	cat >> genmake_hello.c << EOF
+    echo >> $LOGFILE
+    echo "running: look_for_C_compilers()" >> $LOGFILE
+    rm -f ./genmake_hello.c  ./genmake_hello
+    cat >> genmake_hello.c << EOF
 #include <stdio.h>
 int main(int argc, char **argv) {
   printf("Hello!\n");
   return 0;
 }
 EOF
-	$c -o genmake_hello genmake_hello.c > /dev/null 2>&1
+    tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc icc"
+    p_CC=
+    for c in $tmp ; do
+	COMM="$c $CFLAGS -o genmake_hello genmake_hello.c"
+	echo $COMM >> $LOGFILE
+	$COMM >> $LOGFILE 2>&1
 	RETVAL=$?
 	if test "x${RETVAL}" = x0 ; then
+	    echo " $c test successful" >> $LOGFILE
 	    p_CC="$p_CC $c"
 	fi
     done
@@ -321,18 +502,20 @@
 EOF
 	exit 1
     else
-	echo "  The possible C compilers found in your path are:"
-	echo "   "$p_CC
+	echo "  The possible C compilers found in your path are: $p_CC" | tee -a $LOGFILE
 	if test "x$CC" = x ; then
 	    CC=`echo $p_CC | $AWK '{print $1}'`
 	    echo "  Setting C compiler to: "$CC
 	fi
     fi
+    echo " --> set CC='$CC'" >> $LOGFILE
 }
 
 # Guess possible config options for this host
 find_possible_optfile()  {
 
+    echo >> $LOGFILE
+    echo "running: find_possible_optfile()" >> $LOGFILE
     tmp1=`uname`"_"`uname -m`
     tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'`
@@ -342,48 +525,32 @@
     PLATFORM=$tmp3
     echo $PLATFORM | grep cygwin > /dev/null 2>&1  &&  PLATFORM=cygwin_ia32
     OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
-    echo "  The platform appears to be:  $PLATFORM"
-
-#    echo "test" > test
-#    ln -s ./test link
-#    RETVAL=$?
-#    if test "x${RETVAL}" = x0 ; then
-#	LN="ln -s"
-#    else
-#	echo "Error: \"ln -s\" does not appear to work on this system!"
-#	echo "  For help, please contact <MITgcm-support@mitgcm.org>."
-#	exit 1
-#    fi
-#    rm -f test link
-#
-#    if test "x$CPP" = x ; then
-#	CPP="cpp -traditional -P"
-#    fi
-#
-#    look_for_makedepend
-#
-#    look_for_C_compilers
+    echo "  The platform appears to be:  $PLATFORM" | tee -a $LOGFILE
 
     #================================================================
     #  look for possible FORTRAN compilers
-    tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc ifort f90 f95 mpif77 mpf77 mpxlf95 gfortran g95"
+    echo "  look for possible FORTRAN compilers" >> $LOGFILE
+    tmp="$MITGCM_FC $FC efc gfortran g77 f77 pgf77 pgf95 ifc ifort f90 f95 mpif77 mpf77 mpxlf95 g95"
     p_FC=
-    for c in $tmp ; do
-	rm -f ./hello.f ./hello
-	cat >> hello.f <<EOF
+    rm -f ./genmake_hello.f
+    cat >> genmake_hello.f <<EOF
       program hello
       do i=1,3
         print *, 'hello world : ', i
       enddo
       end
 EOF
-	$c -o hello hello.f > /dev/null 2>&1
+    for f in $tmp ; do
+	COMM="$f -o genmake_hello genmake_hello.f"
+	echo $COMM >> $LOGFILE
+	$COMM >> $LOGFILE 2>&1
 	RETVAL=$?
 	if test "x${RETVAL}" = x0 ; then
-	    p_FC="$p_FC $c"
+	    echo " $f test successful" >> $LOGFILE
+	    p_FC="$p_FC $f"
 	fi
     done
-    rm -f ./hello.f ./hello
+    rm -f ./genmake_hello.f ./genmake_hello
     if test "x${p_FC}" = x ; then
 	cat 1>&2 <<EOF
 
@@ -396,8 +563,7 @@
 EOF
 	exit 1
     else
-	echo "  The possible FORTRAN compilers found in your path are:"
-	echo "   "$p_FC
+	echo "  The possible FORTRAN compilers found in your path are: $p_FC" | tee -a $LOGFILE
     fi
 
     #  Use the first of the compilers found in the current PATH
@@ -406,7 +572,7 @@
 	for i in $p_FC ; do
 	    OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
 	    if test -r $OPTFILE ; then
-		echo "  Setting OPTFILE to: "$OPTFILE
+		echo "  Setting OPTFILE to: "$OPTFILE | tee -a $LOGFILE
 		break
 	    fi
 	done
@@ -415,8 +581,8 @@
     if test "x$OPTFILE" = x ; then
 	OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$FC
 	if test ! -r $OPTFILE ; then
-             echo "  I looked for the file "$OPTFILE" but did not find it"
-        fi
+	     echo "  I looked for the file "$OPTFILE" but did not find it"
+	fi
     fi
 
     if test "x$OPTFILE" = x ; then
@@ -434,36 +600,81 @@
 EOF
 	exit 1
     fi
+}
+
+#  Do a local copy of MPI headers files (in local dir ./mpi_headers/) after
+#  checking for additional included headers (in case of chain of included header)
+mpi_headers_do_local_copy() {
 
-#     # look for possible MPI libraries
-#     mpi_libs=
-#     mpi_fort=`which mpif77 2>/dev/null`
-#     RETVAL=$?
-#     if test "x${RETVAL}" = x0 ; then
-# 	cat >>test.f <<EOF
-#       PROGRAM HELLO
-#       DO 10, I=1,10
-#       PRINT *,'Hello World'
-#    10 CONTINUE
-#       STOP
-#       END
-# EOF
-# 	eval "$mpi_fort -showme test.f > out"
-# 	RETVAL=$?
-# 	if test "x${RETVAL}" = x0 ; then
-# 	    a=`cat out`
-# 	    for i in $a ; do
-# 		case $i in
-# 		    -*)
-# 			mpi_libs="$mpi_libs $i" ;;
-# 		esac
-# 	    done
-# 	    echo "The MPI libs appear to be:"
-# 	    echo "  "$mpi_libs
-# 	fi
-# 	rm -f test.f out
-#     fi
+    dBug=0
+    rm -rf ./mpi_headers
+    if test -d $MPIINCLUDEDIR ; then
 
+	#----- check for additional headers (chain of included headers)
+	echo -n '  Check MPI headers ... '
+	listIni=$MPI_HEADER_FILES
+	echo $listIni | grep "\<mpif.h\>" > /dev/null 2>&1
+	outp=$?
+	#- always check mpif.h (the only mpi-header included in standard MITgcm code)
+	if test $outp != 0 ; then listIni="mpif.h $listIni" ; fi
+	if test $dBug = 1 ; then echo "listIni='$listIni'" ; fi
+
+	doCheck=1 ; list2copy='' ; list2check=$listIni
+	while test $doCheck = 1 ; do
+	  newList=''
+	  for i in $list2check ; do
+	    if test -f $MPIINCLUDEDIR/$i ; then
+	      newInc=`grep '^ *include ' $MPIINCLUDEDIR/$i | \
+		sed -e 's/^ *include //' -e 's/\!.*$//' -e "s/'//g"  -e 's/\"//g'`
+	      if test $dBug = 1 ; then echo -n "checking $i : newInc='$newInc'" ; fi
+	      for j in $newInc ; do
+		echo $listIni $list2copy $newList | grep "\<$j\>" > /dev/null 2>&1
+		outp=$?
+	        if test $outp != 0 ; then
+		  if test $dBug = 1 ; then echo -n " ; adding $j" ; fi
+		  newList="$newList $j"
+		fi
+	      done
+	      if test $dBug = 1 ; then echo "" ; fi
+	    fi
+	  done
+	  if test "x$newList" = x ; then doCheck=0
+	  else list2check=$newList ; list2copy="$list2copy $newList"
+	  fi
+	done
+	list2copy="$MPI_HEADER_FILES $list2copy"
+	if test $dBug = 1 ; then echo "list2copy='$list2copy'" ; fi
+
+	#----- create local mpi_headers dir if we have files to copy
+	mkListInc=`echo $list2copy | wc -w`
+	if test $mkListInc != 0 ; then
+	  echo 'create local "./mpi_headers" dir'
+	  mkdir -p ./mpi_headers
+	  INCLUDES="-I./mpi_headers $INCLUDES"
+	  mkListInc=1
+	fi
+	if test "x$LOCAL_MPI_HEADERS" != x ; then mkListInc=0 ; fi
+
+	#----- make local copy and update LOCAL_MPI_HEADERS (if not already set)
+	for i in $list2copy ; do
+	  if test -f $MPIINCLUDEDIR/$i ; then
+	    cp -p $MPIINCLUDEDIR/$i ./mpi_headers
+	    if test $i = 'mpif.h' ; then
+		perl -i -pe 's/MPI_DISPLACEMENT_CURRENT=-1_8/MPI_DISPLACEMENT_CURRENT=-1/g' mpi_headers/mpif.h
+	    fi
+	    if test $mkListInc = 2 ; then
+		LOCAL_MPI_HEADERS="$LOCAL_MPI_HEADERS ./mpi_headers/$i"
+	    fi
+	    if test $mkListInc = 1 ; then
+		LOCAL_MPI_HEADERS="./mpi_headers/$i" ; mkListInc=2
+	    fi
+	  fi
+	done
+    else
+	echo "WARNING: MPIINCLUDEDIR='$MPIINCLUDEDIR' is not a directory"
+	echo "WARNING: => skip checking for MPI headers (no ./mpi_headers dir)"
+#	exit -1
+    fi
 }
 
 #  Parse the package dependency information
@@ -481,165 +692,6 @@
     fi
     . ./.pd_tmp
     rm -f ./.pd_tmp
-
-}
-
-
-#  Explain usage
-usage()  {
-cat <<EOF
-
-Usage: "$0" [OPTIONS]
-  where [OPTIONS] can be:
-
-    -help | --help | -h | --h
-          Print this help message and exit.
-
-    -adoptfile NAME | --adoptfile NAME | -adof NAME | --adof NAME
-      -adoptfile=NAME | --adoptfile=NAME | -adof=NAME | --adof=NAME
-          Use "NAME" as the adoptfile.  By default, the file at
-          "tools/adjoint_options/adjoint_default" will be used.
-
-    -nooptfile | --nooptfile
-      -optfile NAME | --optfile NAME | -of NAME | --of NAME
-      -optfile=NAME | --optfile=NAME | -of=NAME | --of=NAME
-          Use "NAME" as the optfile.  By default, an attempt will be
-          made to find an appropriate "standard" optfile in the
-          tools/build_options/ directory.
-
-    -pdepend NAME | --pdepend NAME
-      -pdepend=NAME | --pdepend=NAME
-          Get package dependency information from "NAME".
-
-    -pgroups NAME | --pgroups NAME
-      -pgroups=NAME | --pgroups=NAME
-          Get the package groups information from "NAME".
-
-    -bash NAME
-          Explicitly specify the Bourne or BASH shell to use
-
-    -make NAME | -m NAME
-      --make=NAME | -m=NAME
-          Use "NAME" for the MAKE program. The default is "make" but
-          many platforms, "gmake" is the preferred choice.
-
-    -makefile NAME | -mf NAME
-      --makefile=NAME | -mf=NAME
-          Call the makefile "NAME".  The default is "Makefile".
-
-    -makedepend NAME | -md NAME
-      --makedepend=NAME | -md=NAME
-          Use "NAME" for the MAKEDEPEND program.
-
-    -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME
-      -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME
-          Specify the location of the MITgcm ROOTDIR as "NAME".
-          By default, genamke will try to find the location by
-          looking in parent directories (up to the 5th parent).
-
-    -mods NAME | --mods NAME | -mo NAME | --mo NAME
-      -mods=NAME | --mods=NAME | -mo=NAME | --mo=NAME
-          Here, "NAME" specifies a list of directories that are
-          used for additional source code.  Files found in the
-          "mods list" are given preference over files of the same
-          name found elsewhere.
-
-    -disable NAME | --disable NAME
-      -disable=NAME | --disable=NAME
-          Here "NAME" specifies a list of packages that we don't
-          want to use.  If this violates package dependencies,
-          genamke will exit with an error message.
-
-    -enable NAME | --enable NAME
-      -enable=NAME | --enable=NAME
-          Here "NAME" specifies a list of packages that we wish
-          to specifically enable.  If this violates package
-          dependencies, genamke will exit with an error message.
-
-    -standarddirs NAME | --standarddirs NAME
-      -standarddirs=NAME | --standarddirs=NAME
-          Here, "NAME" specifies a list of directories to be
-          used as the "standard" code.
-
-    -fortran NAME | --fortran NAME | -fc NAME | --fc NAME
-      -fc=NAME | --fc=NAME
-          Use "NAME" as the fortran compiler.  By default, genmake
-          will search for a working compiler by trying a list of
-          "usual suspects" such as g77, f77, etc.
-
-    -cc NAME | --cc NAME | -cc=NAME | --cc=NAME
-          Use "NAME" as the C compiler.  By default, genmake
-          will search for a working compiler by trying a list of
-          "usual suspects" such as gcc, c89, cc, etc.
-
-    -[no]ieee | --[no]ieee
-          Do or don't use IEEE numerics.  Note that this option
-          *only* works if it is supported by the OPTFILE that
-          is being used.
-
-    -use_real4 | -use_r4 | -ur4 | --use_real4 | --use_r4 | --ur4
-          Use "real*4" type for _RS variable (#undef REAL4_IS_SLOW)
-          *only* works if CPP_EEOPTIONS.h allows this.
-
-    -ignoretime | -ignore_time | --ignoretime | --ignore_time
-          Ignore all the "wall clock" routines entirely.  This will
-          not in any way hurt the model results -- it simply means
-          that the code that checks how long the model spends in
-          various routines will give junk values.
-
-    -ts | --ts
-          Produce timing information per timestep
-    -papis | --papis
-          Produce summary MFlop/s (and IPC) with PAPI per timestep
-    -pcls | --pcls
-          Produce summary MFlop/s etc. with PCL per timestep
-    -foolad | --foolad
-          Fool the AD code generator
-    -papi | --papi
-          Performance analysis with PAPI
-    -pcl | --pcl
-          Performance analysis with PCL
-    -hpmt | --hpmt
-          Performance analysis with the HPM Toolkit
-
-    -gsl | --gsl
-          Use GSL to control floating point rounding and precision
-    -devel | --devel
-          Add additional warning and debugging flags for development
-
-    -mpi | --mpi
-          Include MPI header files and link to MPI libraries
-    -mpi=PATH | --mpi=PATH
-          Include MPI header files and link to MPI libraries using MPI_ROOT
-          set to PATH. i.e. Include files from \$PATH/include, link to libraries
-          from \$PATH/lib and use binaries from \$PATH/bin.
-
-    -omp | --omp
-          Activate OpenMP code + use Compiler option OMPFLAG
-    -omp=OMPFLAG | --omp=OMPFLAG
-          Activate OpenMP code + use Compiler option OMPFLAG
-
-    -es | --es | -embed-source | --embed-source
-          Embed a tarball containing the full source code
-          (including the Makefile, etc.) used to build the
-          executable [off by default]
-
-  While it is most often a single word, the "NAME" variables specified
-  above can in many cases be a space-delimited string such as:
-
-    --enable pkg1   --enable 'pkg1 pkg2'   --enable 'pkg1 pkg2 pkg3'
-    -mods=dir1   -mods='dir1'   -mods='dir1 dir2 dir3'
-    -foptim='-Mvect=cachesize:512000,transform -xtypemap=real:64,double:64,integer:32'
-
-  which, depending upon your shell, may need to be single-quoted.
-
-  For more detailed genmake documentation, please see:
-
-    http://mitgcm.org/public/devel_HOWTO/
-
-EOF
-
-    exit 1
 }
 
 #  Build a CPP macro to automate calling C routines from FORTRAN
@@ -647,7 +699,7 @@
 
     #echo "FC_NAMEMANGLE = \"$FC_NAMEMANGLE\""
     if test ! "x$FC_NAMEMANGLE" = x ; then
-        return 0
+	return 0
     fi
     echo " running: get_fortran_c_namemangling()" >> $LOGFILE
 
@@ -656,7 +708,6 @@
     cat > genmake_test.c <<EOF
 void tcall( char * string ) { tsub( string ); }
 EOF
-#   $MAKE genmake_test.o >> $LOGFILE 2>&1
     COMM="$CC $CFLAGS -c genmake_test.c"
     echo ' '$COMM >> $LOGFILE
     $COMM >> $LOGFILE 2>&1
@@ -741,7 +792,6 @@
     echo " --> set FC_NAMEMANGLE='$FC_NAMEMANGLE'" >> $LOGFILE
 }
 
-
 check_HAVE_CLOC()  {
     echo >> $LOGFILE
     echo "running: check_HAVE_CLOC()" >> $LOGFILE
@@ -781,13 +831,11 @@
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_CLOC=t
-	DEFINES="$DEFINES -DHAVE_CLOC"
     fi
     rm -f genmake_tc*
     echo " --> set HAVE_CLOC='$HAVE_CLOC'" >> $LOGFILE
 }
 
-
 check_HAVE_SIGREG()  {
     if test ! "x$HAVE_SIGREG" = x ; then
 	return
@@ -844,18 +892,12 @@
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_SIGREG=t
-	DEFINES="$DEFINES -DHAVE_SIGREG"
     fi
     rm -f genmake_tc*
     echo " --> set HAVE_SIGREG='$HAVE_SIGREG'" >> $LOGFILE
 }
 
-
 check_HAVE_SETRLSTK()  {
-    if test "x$HAVE_SETRLSTK" = xt ; then
-	DEFINES="$DEFINES -DHAVE_SETRLSTK"
-	return
-    fi	
     if test ! "x$HAVE_SETRLSTK" = x ; then
 	return
     fi
@@ -893,13 +935,11 @@
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_SETRLSTK=t
-	DEFINES="$DEFINES -DHAVE_SETRLSTK"
     fi
     rm -f genmake_tc*
     echo " --> set HAVE_SETRLSTK='$HAVE_SETRLSTK'" >> $LOGFILE
 }
 
-
 check_HAVE_STAT()  {
     echo >> $LOGFILE
     echo "running: check_HAVE_STAT()" >> $LOGFILE
@@ -941,13 +981,11 @@
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_STAT=t
-	DEFINES="$DEFINES -DHAVE_STAT"
     fi
     rm -f genmake_tc*
     echo " --> set HAVE_STAT='$HAVE_STAT'" >> $LOGFILE
 }
 
-
 check_netcdf_libs()  {
     if test ! "x$SKIP_NETCDF_CHECK" = x ; then
 	return
@@ -958,9 +996,9 @@
       program fgennc
 #include "netcdf.inc"
 EOF
-    if test ! "x$MPI" = x ; then
-	echo '#include "mpif.h"' >> genmake_tnc.F
-    fi
+   #if test ! "x$MPI" = x ; then
+   #	echo '#include "mpif.h"' >> genmake_tnc.F
+   #fi
     cat <<EOF >> genmake_tnc.F
       integer iret, ncid, xid
       iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)
@@ -1040,7 +1078,148 @@
     echo " --> set HAVE_NETCDF='$HAVE_NETCDF'" >> $LOGFILE
 }
 
+check_lapack_libs()  {
+    if test ! "x$SKIP_LAPACK_CHECK" = x ; then
+	return
+    fi
+    echo >> $LOGFILE
+    echo "running: check_lapack_libs()" >> $LOGFILE
+    cat <<EOF > genmake_tla.F
+      program fgenla
+      integer info
+      integer ipiv( 2 )
+      double precision ab( 4, 2 ), b( 2 )
+      data ab / 0., 0., 1., 2., 0., 2., 1., 0. /
+      data b / 1., 1. /
+      call dgbsv( 2, 1, 1, 1, ab, 4, ipiv, b, 2, info )
+      IF (info .NE. 0) write(*,*) 'Error:', info
+      write(*,*) b
+      end
+EOF
+    echo "===  genmake_tla.F  >>>" > genmake_tla.log
+    cat genmake_tla.F >> genmake_tla.log
+    echo "<<<  genmake_tla.F  ===" >> genmake_tla.log
+    RET_CPP=f
+    COMM="cat genmake_tla.F | $CPP $DEFINES $INCLUDES"
+    echo "$COMM" >> genmake_tla.log
+    eval $COMM > genmake_tla.$FS 2>/dev/null  &&  RET_CPP=t
+    if test "x$RET_CPP" = xf ; then
+	echo "  WARNING: CPP failed to pre-process the lapack test." \
+	    >> genmake_tla.log
+	echo "    Please check that \$INCLUDES is properly set." \
+	    >> genmake_tla.log
+    fi
+    echo "$FC $FFLAGS $FOPTIM -c genmake_tla.$FS  \ " >> genmake_tla.log
+    echo "  &&  $LINK $FFLAGS $FOPTIM -o genmake_tla.o $LIBS" >> genmake_tla.log
+    $FC $FFLAGS $FOPTIM -c genmake_tla.$FS >> genmake_tla.log 2>&1  \
+	&&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS >> genmake_tla.log 2>&1
+    RET_COMPILE=$?
+    cat genmake_tla.log >> $LOGFILE
 
+    # test program execution not always possible (see check_netcdf_libs)
+    #
+    #test -x ./genmake_tla  &&  ./genmake_tla >> genmake_tla.log 2>&1
+    #RETVAL=$?
+    #if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+
+    if test "x$RET_COMPILE" = x0 ; then
+	HAVE_LAPACK=t
+	echo "check_lapack: successful" >> $LOGFILE
+    else
+	# try again with "-llapack" added to the libs
+	echo "==> try again with added '-llapack'" > genmake_tla.log
+	echo "cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS \ " >> genmake_tla.log
+	echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS \ " >> genmake_tla.log
+	echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack" >> genmake_tla.log
+	cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS 2>/dev/null  \
+	    &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS >> genmake_tla.log 2>&1  \
+	    &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack >> genmake_tla.log 2>&1
+	RET_COMPILE=$?
+	echo >> $LOGFILE
+	cat genmake_tla.log >> $LOGFILE
+	if test "x$RET_COMPILE" = x0 ; then
+	    LIBS="$LIBS -llapack"
+	    HAVE_LAPACK=t
+	    echo "check_lapack: successful" >> $LOGFILE
+	else
+	# try again with "-lf77blas -lcblas" added to the libs
+	    echo "==> try again with added '-llapack -lf77blas -lcblas'" > genmake_tla.log
+	    echo "cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS \ " >> genmake_tla.log
+	    echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS \ " >> genmake_tla.log
+	    echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack -lf77blas -lcblas" >> genmake_tla.log
+	    cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS 2>/dev/null  \
+		&&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS >> genmake_tla.log 2>&1  \
+		&&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack -lf77blas -lcblas >> genmake_tla.log 2>&1
+	    RET_COMPILE=$?
+	    echo >> $LOGFILE
+	    cat genmake_tla.log >> $LOGFILE
+	    if test "x$RET_COMPILE" = x0 ; then
+		LIBS="$LIBS -llapack -lf77blas -lcblas"
+		HAVE_LAPACK=t
+		echo "check_lapack: successful" >> $LOGFILE
+	    else
+	    # try again with "-latlas" added to the libs
+		echo "==> try again with added '-llapack -lf77blas -lcblas -latlas'" > genmake_tla.log
+		echo "cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS \ " >> genmake_tla.log
+		echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS \ " >> genmake_tla.log
+		echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack -lf77blas -lcblas -latlas" >> genmake_tla.log
+		cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS 2>/dev/null  \
+		    &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS >> genmake_tla.log 2>&1  \
+		    &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack -lf77blas -lcblas -latlas >> genmake_tla.log 2>&1
+		RET_COMPILE=$?
+		echo >> $LOGFILE
+		cat genmake_tla.log >> $LOGFILE
+		if test "x$RET_COMPILE" = x0 ; then
+		    LIBS="$LIBS -llapack -lf77blas -lcblas -latlas"
+		    HAVE_LAPACK=t
+		    echo "check_lapack: successful" >> $LOGFILE
+		fi
+	    fi
+	fi
+    fi
+    rm -f genmake_tla*
+    echo " --> set HAVE_LAPACK='$HAVE_LAPACK'" >> $LOGFILE
+}
+
+check_HAVE_FLUSH()  {
+    if test ! "x$SKIP_CHECK_FLUSH" = x ; then
+	return
+    fi
+    echo >> $LOGFILE
+    echo "running: check_HAVE_FLUSH()" >> $LOGFILE
+    cat <<EOF > genmake_tflsh.$FS
+      program fgenflsh
+      integer iounit
+      character*9 fname
+      iounit = 26
+      fname = 'tmp.tflsh'
+      open(iounit,FILE=fname,STATUS='unknown')
+      write(iounit,*) 'genmake_tflsh: hello'
+      call flush(iounit)
+      close(iounit)
+      end
+EOF
+    echo "===  genmake_tflsh.$FS  >>>" > genmake_tflsh.log
+    cat genmake_tflsh.$FS >> genmake_tflsh.log
+    echo "<<<  genmake_tflsh.$FS  ===" >> genmake_tflsh.log
+
+    echo "$FC $FFLAGS $FOPTIM -c genmake_tflsh.$FS  \ " >> genmake_tflsh.log
+    echo "  &&  $LINK $FFLAGS $FOPTIM -o genmake_tflsh.o $LIBS" >> genmake_tflsh.log
+    $FC $FFLAGS $FOPTIM -c genmake_tflsh.$FS >> genmake_tflsh.log 2>&1  \
+	&&  $LINK $FFLAGS $FOPTIM -o genmake_tflsh genmake_tflsh.o $LIBS >> genmake_tflsh.log 2>&1
+    RET_COMPILE=$?
+
+    if test "x$RET_COMPILE" = x0 ; then
+	HAVE_FLUSH=t
+	#cat genmake_tflsh.log >> $LOGFILE
+	echo "  check_HAVE_FLUSH: successful" >> $LOGFILE
+    else
+	HAVE_FLUSH=f
+	cat genmake_tflsh.log >> $LOGFILE
+    fi
+    rm -f genmake_tflsh*
+    echo " --> set HAVE_FLUSH='$HAVE_FLUSH'" >> $LOGFILE
+}
 
 ###############################################################################
 #   Sequential part of script starts here
@@ -1073,6 +1252,7 @@
 FEXTRAFLAGS=
 USE_EXTENDED_SRC=
 EXTENDED_SRC_FLAG=
+GET_FC_VERSION=
 CFLAGS=
 KFLAGS1=
 KFLAGS2=
@@ -1097,6 +1277,9 @@
 DEVEL=
 HAVE_TEST_L=
 
+# comment this line out to enable lapack test
+SKIP_LAPACK_CHECK=t
+
 # DEFINES checked by test compilation or command-line
 HAVE_SYSTEM=
 HAVE_FDATE=
@@ -1107,6 +1290,8 @@
 HAVE_NETCDF=
 HAVE_ETIME=
 IGNORE_TIME=
+HAVE_LAPACK=
+HAVE_FLUSH=
 
 MODS=
 TOOLSDIR=
@@ -1114,6 +1299,9 @@
 INCLUDEDIRS=
 STANDARDDIRS="USE_THE_DEFAULT"
 
+#- local config file
+gm_local="genmake_local"
+
 G2ARGS=
 BASH=
 PWD=`pwd`
@@ -1129,7 +1317,6 @@
 EXECUTABLE=
 EXEHOOK=
 EXEDIR=
-PACKAGES_CONF=
 IEEE=
 if test "x$MITGCM_IEEE" != x ; then
     IEEE=$MITGCM_IEEE
@@ -1150,23 +1337,29 @@
 SVD_TAMC_FLAGS=
 TAMC_EXTRA=
 
+DIVA=
+MPIINCLUDEDIR=
+MPI_HEADER_FILES=
+LOCAL_MPI_HEADERS=
+
 #  The following state can be set directly by command-line switches
-gm_s1="OPTFILE PKG_DEPEND PKG_GROUPS MAKEFILE MAKEDEPEND PLATFORM ROOTDIR MODS DISABLE ENABLE"
-gm_s2="FC IEEE USE_R4 TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI OMP DUMPSTATE STANDARDDIRS"
+gm_s1="ROOTDIR STANDARDDIRS MODS PKG_DEPEND PKG_GROUPS DISABLE ENABLE"
+gm_s2="PLATFORM OPTFILE MAKE MAKEFILE MAKEDEPEND FC CC MPI OMP USE_R4"
+gm_s3="FEXTRAFLAGS IEEE DEVEL GSL TS PAPIS PCLS PAPI PCL HPMT DUMPSTATE"
 
 #  The following state is not directly set by command-line switches
-gm_s3="LN S64 LINK MAKE PACKAGES INCLUDES FFLAGS FOPTIM FEXTRAFLAGS"
-gm_s4="CFLAGS LIBS KPP KFLAGS1 KFLAGS2 KPPFILES NOOPTFILES NOOPTFLAGS"
-gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD THISHOST THISUSER THISDATE THISVER MACHINE"
-gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
-gm_s7="FC_NAMEMANGLE HAVE_NETCDF HAVE_SYSTEM HAVE_FDATE HAVE_ETIME"
+gm_s4="LN S64 LINK PACKAGES INCLUDES FFLAGS FOPTIM"
+gm_s5="CFLAGS LIBS KPP KFLAGS1 KFLAGS2 KPPFILES NOOPTFILES NOOPTFLAGS"
+gm_s6="PWD TOOLSDIR SOURCEDIRS INCLUDEDIRS EXEDIR EXECUTABLE EXEHOOK"
+gm_s7="TMP THISHOST THISUSER THISDATE THISVER MACHINE FC_NAMEMANGLE"
+gm_s8="HAVE_NETCDF HAVE_SYSTEM HAVE_FDATE HAVE_ETIME HAVE_LAPACK HAVE_FLUSH"
 
 #  The following are all related to adjoint/tangent-linear stuff
 gm_s10="AUTODIFF_PKG_USED AD_OPTFILE TAMC TAF AD_TAMC_FLAGS AD_TAF_FLAGS"
 gm_s11="FTL_TAMC_FLAGS FTL_TAF_FLAGS SVD_TAMC_FLAGS SVD_TAF_FLAGS"
-gm_s12="TAF_EXTRA TAMC_EXTRA"
+gm_s12="TAF_EXTRA TAMC_EXTRA DIVA MPIINCLUDEDIR MPI_HEADER_FILES"
 
-gm_state="COMMANDL $gm_s1 $gm_s2 $gm_s3 $gm_s4 $gm_s5 $gm_s6 $gm_s7"
+gm_state="COMMANDL $gm_s1 $gm_s2 $gm_s3 $gm_s4 $gm_s5 $gm_s6 $gm_s7 $gm_s8"
 gm_state="$gm_state $gm_s10 $gm_s11 $gm_s12"
 
 cat <<EOF
@@ -1185,16 +1378,6 @@
 rm -f genmake_state genmake_*optfile $LOGFILE
 
 echo "===  Processing options files and arguments  ==="
-gm_local="genmake_local"
-printf "  getting local config information:  "
-if test -f $gm_local ; then
-    echo "using $gm_local"
-    . $gm_local
-    # echo "DISABLE=$DISABLE"
-    # echo "ENABLE=$ENABLE"
-else
-    echo "none found"
-fi
 
 #echo "$0::$1:$2:$3:$4:$5:$6:$7:"
 #parse_options
@@ -1213,79 +1396,79 @@
     ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
     case $ac_option in
-	
+
 	-help | --help | -h | --h)
 	    usage ;;
-	
+
 	-nooptfile | --nooptfile)
 	    OPTFILE="NONE" ;;
 	-optfile | --optfile | -of | --of)
 	    ac_prev=OPTFILE ;;
 	-optfile=* | --optfile=* | -of=* | --of=*)
 	    OPTFILE=$ac_optarg ;;
-	
+
 	-adoptfile | --adoptfile | -adof | --adof)
 	    ac_prev=AD_OPTFILE ;;
 	-adoptfile=* | --adoptfile=* | -adof=* | --adof=*)
 	    AD_OPTFILE=$ac_optarg ;;
-	
+
 	-pdepend | --pdepend)
 	    ac_prev=PKG_DEPEND ;;
 	-pdepend=* | --pdepend=*)
 	    PKG_DEPEND=$ac_optarg ;;
-	
+
 	-pgroups | --pgroups)
 	    ac_prev=PKG_GROUPS ;;
 	-pgroups=* | --pgroups=*)
 	    PKG_GROUPS=$ac_optarg ;;
-	
+
 	-make | --make | -m | --m)
 	    ac_prev=MAKE ;;
 	-make=* | --make=* | -m=* | --m=*)
 	    MAKE=$ac_optarg ;;
-	
+
 	-bash | --bash)
 	    ac_prev=BASH ;;
 	-bash=* | --bash=*)
 	    BASH=$ac_optarg ;;
-	
+
 	-makedepend | --makedepend | -md | --md)
 	    ac_prev=MAKEDEPEND ;;
 	-makedepend=* | --makedepend=* | -md=* | --md=*)
 	    MAKEDEPEND=$ac_optarg ;;
-	
-	-makefile | --makefile | -ma | --ma)
+
+	-makefile | --makefile | -mf | --mf)
 	    ac_prev=MAKEFILE ;;
-	-makefile=* | --makefile=* | -ma=* | --ma=*)
+	-makefile=* | --makefile=* | -mf=* | --mf=*)
 	    MAKEFILE=$ac_optarg ;;
-	
+
 	-platform | --platform | -pl | --pl | -platform=* | --platform=* | -pl=* | --pl=*)
 	    echo "ERROR: The platform option has been removed.  Please specify"
 	    echo "  the build options using the \"optfile\" mechanism."
 	    echo
 	    usage
 	    ;;
-	
+
 	-rootdir | --rootdir | -rd | --rd)
 	    ac_prev=ROOTDIR ;;
 	-rootdir=* | --rootdir=* | -rd=* | --rd=*)
 	    ROOTDIR=$ac_optarg ;;
-	
+
 	-mods | --mods | -mo | --mo)
 	    ac_prev=MODS ;;
 	-mods=* | --mods=* | -mo=* | --mo=*)
 	    MODS=$ac_optarg ;;
-	
+
 	-disable | --disable)
 	    ac_prev=DISABLE ;;
 	-disable=* | --disable=*)
 	    DISABLE=$ac_optarg ;;
-	
+
 	-enable | --enable)
 	    ac_prev=ENABLE ;;
 	-enable=* | --enable=*)
 	    ENABLE=$ac_optarg ;;
-	
+
 	-standarddirs | --standarddirs)
 	    ac_prev=STANDARDDIRS ;;
 	-standarddirs=* | --standarddirs=*)
@@ -1295,35 +1478,39 @@
 #		ac_prev=cpp ;;
 #	    -cpp=* | --cpp=*)
 #		CPP=$ac_optarg ;;
-	
+
 	-cc | --cc)
 	    ac_prev=CC ;;
 	-cc=* | --cc=*)
 	    CC=$ac_optarg ;;
-	
+
 	-fortran | --fortran | -fc | --fc)
 	    ac_prev=FC ;;
 	-fc=* | --fc=*)
 	    FC=$ac_optarg ;;
-	
+
 	-fs | --fs)
 	    ac_prev=FS ;;
 	-fs=* | --fs=*)
 	    FS=$ac_optarg ;;
-	
+
 	-fs90 | --fs90)
 	    ac_prev=FS90 ;;
 	-fs90=* | --fs90=*)
 	    FS90=$ac_optarg ;;
-	
-	-ieee | --ieee)
-	    IEEE=true ;;
-	-noieee | --noieee)
-	    IEEE= ;;
 
 	-use_real4 | -use_r4 | -ur4 | --use_real4 | --use_r4 | --ur4 )
 	    USE_R4=true ;;
 
+	-ieee | --ieee)
+	    IEEE=true ;;
+	-noieee | --noieee)
+	    echo "Warning: ignore option '$ac_option' (default is already without '-ieee')" ;;
+	-devel | --devel)
+	    IEEE=true ; DEVEL=true ;;
+	-gsl | --gsl)
+	    GSL=true ;;
+
 	-ts | --ts)
 	    TS=true ;;
 	-papis | --papis)
@@ -1339,27 +1526,26 @@
 	-hpmt | --hpmt)
 	    HPMT=true ;;
 
-        -gsl | --gsl)
-	    GSL=true ;;
-
-        -devel | --devel)
-	    DEVEL=true ;;
-
 	-mpi | --mpi)
 	    MPI=true ;;
 	-mpi=* | --mpi=*)
 	    MPIPATH=$ac_optarg
 	    MPI=true ;;
-	
- 	-omp | --omp)
- 	    OMP=true ;;
+
+	-omp | --omp)
+	    OMP=true ;;
 	-omp=* | --omp=*)
 	    OMPFLAG=$ac_optarg
 	    OMP=true ;;
-	
+
 	-ds | --ds)
 	    DUMPSTATE=t ;;
-	
+
+	-extra_flag | --extra_flag)
+	    ac_prev=FEXTRAFLAGS ;;
+	-extra_flag=* | --extra_flag=*)
+	    FEXTRAFLAGS=$ac_optarg ;;
+
 	-taf_extra | --taf_extra)
 	    ac_prev=TAF_EXTRA ;;
 	-taf_extra=* | --taf_extra=*)
@@ -1369,7 +1555,7 @@
 	    ac_prev=TAMC_EXTRA ;;
 	-tamc_extra=* | --tamc_extra=*)
 	    TAMC_EXTRA=$ac_optarg ;;
-	
+
 	-ignoretime | -ignore_time | --ignoretime | --ignore_time)
 	    IGNORE_TIME="-DIGNORE_TIME" ;;
 
@@ -1380,23 +1566,42 @@
 	    echo "Error: unrecognized option: "$ac_option
 	    usage
 	    ;;
-	
+
 	*)
 	    echo "Error: unrecognized argument: "$ac_option
 	    usage
 	    ;;
-	
+
     esac
 
 done
 
+#TMP=./genmk_$$
+#- try to put temporary files in system-local /tmp dir
+TMP=/tmp/genmk_$$
+touch $TMP ; retVal=$?
+if [ $retVal -eq 0 ] ; then
+  if test ! -r $TMP ; then TMP=./genmk_$$ ; fi
+else
+  TMP=./genmk_$$
+fi
+rm -f $TMP
+#echo "  temp files: $TMP.*"
+
+printf "  getting local config information:  "
+if test -f $gm_local ; then
+    echo "using $gm_local"
+    . $gm_local
+else
+    echo "none found"
+fi
 
 if test -f ./.genmakerc ; then
     echo
     echo "WARNING: genmake2 has detected a copy of the old-style \"./.genmakerc\""
     echo "  file.  This file format is no longer supported.  For directions on"
     echo "  how to setup and use the new \"genmake2\" script, please see:"
-    echo "    http://mitgcm.org/devel_HOWTO/"
+    echo "    http://mitgcm.org/public/devel_HOWTO/"
     echo "  and send an email to MITgcm-support@mitgcm.org if you need help."
     echo "WARNING: ignore \"./.genmakerc\" and continue."
     echo
@@ -1411,8 +1616,8 @@
 	for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
 	    if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then
 		ROOTDIR=$d
-		printf "Warning:  ROOTDIR was not specified but there appears to be"
-		echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."
+		printf "Warning: ROOTDIR was not specified ;"
+		echo " try using a local copy of MITgcm found at \"$ROOTDIR\""
 		break
 	    fi
 	done
@@ -1444,7 +1649,7 @@
     MAKEFILE="Makefile"
 fi
 
-echo "  getting OPTFILE information:  "
+echo "  getting OPTFILE information:"
 if test "x${OPTFILE}" = x ; then
     if test "x$MITGCM_OF" = x ; then
 	echo "Warning: no OPTFILE specified so we'll look for possible settings"
@@ -1473,7 +1678,7 @@
     fi
 fi
 
-echo "  getting AD_OPTFILE information:  "
+echo "  getting AD_OPTFILE information:"
 if test "x${AD_OPTFILE}" = x ; then
     if test "x$MITGCM_AD_OF" = x ; then
 	AD_OPTFILE=$ROOTDIR/tools/adjoint_options/adjoint_default
@@ -1519,17 +1724,22 @@
 EOF
     exit 1
 fi
+if test "x$GET_FC_VERSION" != x ; then
+  echo "Get compiler version using: $FC $GET_FC_VERSION" >> $LOGFILE
+  ff=`echo $FC | sed 's/ .*//'` ; xx=`echo $ff | sed 's/^./& /' | sed 's/ .*//'`
+  if test $xx != '/' ; then which $ff >> $LOGFILE ; fi
+  $FC $GET_FC_VERSION > genmake_fc_vers1 2> genmake_fc_vers2
+  if test -s genmake_fc_vers1 ; then
+    cat genmake_fc_vers1 >> $LOGFILE
+  else
+    cat genmake_fc_vers2 >> $LOGFILE
+  fi
+  echo "<-- compiler version ----" >> $LOGFILE
+  rm -f genmake_fc_vers1 genmake_fc_vers2
+fi
 
 if test "x$CC" = x ; then
     look_for_C_compilers
-#   CC=cc
-#     cat <<EOF 1>&2
-# Error: no C compiler: please specify using one of the following:
-#   1) within the options file ("CC=...") as specified by "-of=OPTFILE"
-#   2) the "-cc=XXX" command-line option
-#   3) the "./genmake_local" file
-# EOF
-#     exit 1
 fi
 
 if test "x$LINK" = x ; then
@@ -1597,7 +1807,9 @@
 
 if test ! "x$MPI" = x ; then
       echo "  Turning on MPI cpp macros"
-      DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"
+      DEFINES="$DEFINES -DALLOW_USE_MPI"
+#- To compile code older than checkpoint63s (2012/09/05), un-comment the following line:
+#     DEFINES="$DEFINES -DALWAYS_USE_MPI"
 fi
 if test ! "x$OMP" = x ; then
       echo "  Add OMPFLAG and turn on OpenMP cpp macros"
@@ -1614,7 +1826,7 @@
 if test ! "x$TS" = x ; then
       echo "  Turning on timing per timestep"
       if test ! "x$FOOLAD" = x ; then
-            DEFINES="$DEFINES -DTIME_PER_TIMESTEP_SFP"
+	    DEFINES="$DEFINES -DTIME_PER_TIMESTEP_SFP"
       else
 	    DEFINES="$DEFINES -DTIME_PER_TIMESTEP"
       fi
@@ -1650,7 +1862,7 @@
 	  echo "  Sticking with PAPI flop summary per timestep!"
       else
 	  echo "  Turning on performance analysis with PAPI"
-          echo "  Please make sure PAPIINC, PAPILIB are defined"
+	  echo "  Please make sure PAPIINC, PAPILIB are defined"
 	  DEFINES="$DEFINES -DUSE_PAPI"
 	  INCLUDES="$INCLUDES $PAPIINC"
 	  LIBS="$LIBS $PAPILIB"
@@ -1662,7 +1874,7 @@
 	  echo "  Sticking with PCL flop summary per timestep!"
       else
 	  echo "  Turning on performance analysis with PCL"
-          echo "  Please make sure PCLINC, PCLLIB are defined"
+	  echo "  Please make sure PCLINC, PCLLIB are defined"
 	  DEFINES="$DEFINES -DUSE_PCL"
 	  INCLUDES="$INCLUDES $PCLINC"
 	  LIBS="$LIBS $PCLLIB"
@@ -1672,16 +1884,17 @@
       if test ! "x$PAPI" = x ; then
 	  echo "  PAPI and the HPM Toolkit cannot co-exist!"
 	  echo "  Sticking with PAPI!"
-      else if test ! "x$PCL" = x ; then
+      else
+	if test ! "x$PCL" = x ; then
 	  echo "  PCL and the HPM Toolkit cannot co-exist!"
 	  echo "  Sticking with PCL!"
-      else
+	else
 	  echo "  Turning on performance analysis with the HPM Toolkit"
-          echo "  Please make sure HPMTINC, HPMTLIB are defined"
+	  echo "  Please make sure HPMTINC, HPMTLIB are defined"
 	  DEFINES="$DEFINES -DUSE_LIBHPM"
-          INCLUDES="$INCLUDES $HPMTINC"
+	  INCLUDES="$INCLUDES $HPMTINC"
 	  LIBS="$LIBS $HPMTLIB"
-      fi
+	fi
       fi
 fi
 if test ! "x$GSL" = x ; then
@@ -1762,6 +1975,7 @@
 printf "  Can we call simple C routines (here, \"cloc()\") using $FC...  "
 check_HAVE_CLOC
 if test "x$HAVE_CLOC" != x ; then
+    DEFINES="$DEFINES -DHAVE_CLOC"
     echo "yes"
 else
     echo "no"
@@ -1776,6 +1990,7 @@
 printf "  Can we unlimit the stack size using $FC...  "
 check_HAVE_SETRLSTK
 if test "x$HAVE_SETRLSTK" = xt ; then
+    DEFINES="$DEFINES -DHAVE_SETRLSTK"
     echo "yes"
 else
     echo "no"
@@ -1785,6 +2000,7 @@
 printf "  Can we register a signal handler using $FC...  "
 check_HAVE_SIGREG
 if test "x$HAVE_SIGREG" = xt ; then
+    DEFINES="$DEFINES -DHAVE_SIGREG"
     echo "yes"
 else
     echo "no"
@@ -1794,6 +2010,7 @@
 printf "  Can we use stat() through C calls...  "
 check_HAVE_STAT
 if test "x$HAVE_STAT" != x ; then
+    DEFINES="$DEFINES -DHAVE_STAT"
     echo "yes"
 else
     echo "no"
@@ -1803,20 +2020,39 @@
 printf "  Can we create NetCDF-enabled binaries...  "
 check_netcdf_libs
 if test "x$HAVE_NETCDF" != x ; then
+    DEFINES="$DEFINES -DHAVE_NETCDF"
+    echo "yes"
+else
+    echo "no"
+fi
+
+printf "  Can we create LAPACK-enabled binaries...  "
+check_lapack_libs
+if test "x$HAVE_LAPACK" != x ; then
+    DEFINES="$DEFINES -DHAVE_LAPACK"
+    echo "yes"
+else
+    echo "no"
+fi
+
+printf "  Can we call FLUSH intrinsic subroutine...  "
+check_HAVE_FLUSH
+if test "x$HAVE_FLUSH" = xt ; then
+    DEFINES="$DEFINES -DHAVE_FLUSH"
     echo "yes"
 else
     echo "no"
 fi
-DEFINES="$DEFINES $IGNORE_TIME"
 
+DEFINES="$DEFINES $IGNORE_TIME"
 if test "x$EMBED_SRC" = xt ; then
     build_embed_encode
 fi
 if test "x$EMBED_SRC" = xt ; then
     ENABLE="$ENABLE embed_files"
+#   DEFINES="$DEFINES -DHAVE_EMBED_SRC"
 fi
 
-
 printf "\n===  Setting defaults  ===\n"
 printf "  Adding MODS directories: "
 for d in $MODS ; do
@@ -1992,7 +2228,7 @@
 	exit 1
     else
 	echo "    using PKG_LIST=\"$PKG_LIST\""
-        #  Strip the comments and add all the names
+	#  Strip the comments and add all the names
 	pkg_list=`cat $PKG_LIST | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'`
 	RETVAL=$?
 	if test "x${RETVAL}" != x0 ; then
@@ -2013,11 +2249,11 @@
 fi
 
 echo "  applying DISABLE settings"
-echo "" > ./.tmp_pack
+echo "" > $TMP.pack
 for i in $PACKAGES ; do
-    echo $i >> ./.tmp_pack
+    echo $i >> $TMP.pack
 done
-for i in `grep  "-" ./.tmp_pack` ; do
+for i in `grep  "-" $TMP.pack` ; do
     j=`echo $i | sed 's/[-]//'`
     DISABLE="$DISABLE $j"
 done
@@ -2035,22 +2271,22 @@
 done
 PACKAGES="$pack"
 echo "  applying ENABLE settings"
-echo "" > ./.tmp_pack
+echo "" > $TMP.pack
 PACKAGES="$PACKAGES $ENABLE"
 # Test if each explicitly referenced package exists
 for i in $PACKAGES ; do
     j=`echo $i | sed 's/[-+]//'`
     if test ! -d "$ROOTDIR/pkg/$j" ; then
 	echo "Error: dir '$ROOTDIR/pkg/$i' missing for package '$i'"
- 	exit 1
+	exit 1
     fi
-    echo $i >> ./.tmp_pack
+    echo $i >> $TMP.pack
 done
 PACKAGES=
-for i in `grep -v "-" ./.tmp_pack | sort | uniq` ; do
+for i in `grep -v "-" $TMP.pack | sort | uniq` ; do
     PACKAGES="$PACKAGES $i"
 done
-rm -f ./.tmp_pack
+rm -f $TMP.pack
 echo "    packages are: $PACKAGES"
 
 #  Check for package MNC: if NetCDF is available, then build the MNC
@@ -2087,7 +2323,7 @@
 	echo "Error: problem encountered while building source files in pkg/mnc:"
 	cat make_mnc.errors 1>&2
 	if test "x$mnc_in" = x0 ; then
-            exit 1
+	    exit 1
 	else
 	    DISABLE="$DISABLE mnc"
 	fi
@@ -2120,6 +2356,23 @@
     fi
 fi
 
+#  Make sure the openad package is enabled if using OpenAD
+if test "x$OPENAD" != x ; then
+    echo " $PACKAGES " | grep ' openad ' > /dev/null 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" != x0 ; then
+	cat <<EOF
+
+*********************************************************************
+ERROR: when generating an adjoint with OpenAD, the openad package
+  must be enabled.  Please add it to packages.conf.
+*********************************************************************
+
+EOF
+        exit 1
+    fi
+fi
+
 if  test "x${PKG_DEPEND}" != x ; then
   echo "  applying package dependency rules"
   ck=
@@ -2165,7 +2418,7 @@
 
 	#  Do we need to add $dname according to the dependency rules?
 	if test "x$pin" = xt -a "x$plus" = "x+" -a "x$din" = xf ; then
-            #echo "   " $pname ": need to add :" $dname
+	    #echo "   " $pname ": need to add :" $dname
 	    in_dis="f"
 	    for dis in $DISABLE ; do
 		if test "x$dis" = "x$dname" ; then
@@ -2190,7 +2443,7 @@
 	    echo "  the dependency rules for \"$dname\""
 	    exit 1
 	fi
-        i=`echo "$i + 1" | bc -l`
+	i=`echo "$i + 1" | bc -l`
 	#i=$(( $i + 1 ))
     done
     ck=$ck"t"
@@ -2231,7 +2484,7 @@
 	done
 	if test "x$has_pack" = xf ; then
 	    undef=`echo "ALLOW_$n" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-            DISABLED_PACKAGES="$DISABLED_PACKAGES -U$undef"
+	    DISABLED_PACKAGES="$DISABLED_PACKAGES -U$undef"
 	fi
     fi
 done
@@ -2244,7 +2497,7 @@
 #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
     case $i in
 	aim_v23)
-            ENABLED_PACKAGES="$ENABLED_PACKAGES -DALLOW_AIM"
+	    ENABLED_PACKAGES="$ENABLED_PACKAGES -DALLOW_AIM"
 	    echo "Warning: ALLOW_AIM is set to enable aim_v23."
 	    ;;
     esac
@@ -2286,15 +2539,15 @@
     if test -f $try -a -r $try -a "x$CPP_OPTIONS" = x ; then
 	echo "    found CPP_OPTIONS=\"$try\""
 	CPP_OPTIONS="$try"
-        # New safety test: make sure packages are not mentioned in CPP_OPTIONS.h
-        for n in $names ; do
-            test_for_package_in_cpp_options $CPP_OPTIONS $n
-        done
+	# New safety test: make sure packages are not mentioned in CPP_OPTIONS.h
+	for n in $names ; do
+	    test_for_package_in_cpp_options $CPP_OPTIONS $n
+	done
     fi
     try="$i/CPP_EEOPTIONS.h"
     if test -f $try -a -r $try -a "x$CPP_EEOPTIONS" = x ; then
 	echo "    found CPP_EEOPTIONS=\"$try\""
-        # New safety test: make sure MPI is not determined by CPP_EEOPTIONS.h
+	# New safety test: make sure MPI is not determined by CPP_EEOPTIONS.h
 #**** not yet enabled ****
 #        test_for_mpi_in_cpp_eeoptions $try
 #**** not yet enabled ****
@@ -2308,20 +2561,20 @@
 
 #  Here, we build the list of files to be "run through" the adjoint
 #  compiler.
-if test -f ./adSrcFiles.tmp ; then
-    rm -f ./adSrcFiles.tmp
+if test -f $TMP.adSrcFiles ; then
+    rm -f $TMP.adSrcFiles
 fi
 echo "  Creating the list of files for the adjoint compiler."
-touch adSrcFiles.tmp
+touch $TMP.adSrcFiles
 for i in $SOURCEDIRS ; do
     list_files=`( cd $i && ls -1 *.list 2>/dev/null )`
     for j in $list_files ; do
-	cat $i/$j >> adSrcFiles.tmp
+	cat $i/$j >> $TMP.adSrcFiles
     done
 done
 if test ! "x"$FS = "x.f" ; then
-    cat adSrcFiles.tmp | sed -e "s/\.f/.$FS/g" > adSrcFiles.tmp_f
-    mv -f adSrcFiles.tmp_f adSrcFiles.tmp
+    cat $TMP.adSrcFiles | sed -e "s/\.f/.$FS/g" > $TMP.adSrcFiles_f
+    mv -f $TMP.adSrcFiles_f $TMP.adSrcFiles
 fi
 
 echo
@@ -2333,36 +2586,20 @@
     fi
 done
 
-if test ! "x$DIVA" = x ; then
-    echo "  Creating the pseudo-MPI include directory"
-    INCLUDES="-I./mpi_headers $INCLUDES"
-    rm -rf ./mpi_headers
-    mkdir -p ./mpi_headers
-
-    if test "x$MPIINCLUDEDIR" = x ; then
-	if test "x$MPIHOME" = x ; then
-	    MPIHOME='/usr'
-	fi
-	MPIINCLUDEDIR='$MPIHOME/include'
-    fi
-
-    if test -r $MPIINCLUDEDIR/mpif.h ; then
-	for i in $MPI_HEADER_FILES; do
-	    cp -p $MPIINCLUDEDIR/$i ./mpi_headers
-	done
-
-	perl -i -pe 's/MPI_DISPLACEMENT_CURRENT=-1_8/MPI_DISPLACEMENT_CURRENT=-1/g' mpi_headers/mpif.h
-    else
-	echo " We cannot create a copy of mpif.h!"
-#	exit -1
+if test ! "x$DIVA" = x -a ! "x$MPI" = x ; then
+    if test ! "x$MPIINCLUDEDIR" = x ; then
+	#  Do a local copy of MPI headers files (in local dir ./mpi_headers/) after
+	#   checking for additional included headers (in case of chain of included
+	#   header); also set LOCAL_MPI_HEADERS (if not already set)
+        mpi_headers_do_local_copy
     fi
 fi
 
 echo "  Determining the list of source and include files"
-rm -rf .links.tmp
-mkdir .links.tmp
-touch .links.tmp/foo
-if test ! -r ".links.tmp/foo" ; then
+rm -rf $TMP.links
+mkdir $TMP.links
+touch $TMP.links/foo
+if test ! -r "$TMP.links/foo" ; then
     echo
     echo "ERROR : something is wrong with your directory permissions or"
     echo "   your user file-creation mask (\"umask\") since creating a"
@@ -2378,13 +2615,14 @@
     echo
     exit 1
 fi
-rm -f .links.tmp/foo
+rm -f $TMP.links/foo
 
 if test "x$OPENAD" != x ; then
     OAD_DONT_COMPILE="/dev/null"
     OAD_DONT_TRANSFORM="/dev/null"
     OAD_KEEP_ORIGINAL="/dev/null"
     OAD_CB2M_FILES="/dev/null"
+    OADTOOLS="$TOOLSDIR/OAD_support"
     echo "  looking for dontCompile file:  "
     for i in "." $MODS ; do
 	if test -r $i"/dontCompile" ; then
@@ -2420,14 +2658,14 @@
     echo "   OpenAD exceptions:  "
 fi
 
-echo "# This section creates symbolic links" > srclinks.tmp
-echo "" >> srclinks.tmp
-printf 'F77_SRC_FILES = ' > F77srclist.tmp
-printf 'NON_AD_F77_SRC_FILES = ' > nonADF77srclist.tmp
-printf 'C_SRC_FILES = '   > csrclist.tmp
-printf 'F90_SRC_FILES = ' > F90srclist.tmp
-printf 'H_SRC_FILES = '   > hsrclist.tmp
-printf 'AD_FLOW_FILES = ' > ad_flow_files.tmp
+echo "# This section creates symbolic links" > $TMP.srclinks
+echo "" >> $TMP.srclinks
+printf 'F77_SRC_FILES = ' > $TMP.F77srclist
+printf 'NON_AD_F77_SRC_FILES = ' > $TMP.nonADF77srclist
+printf 'C_SRC_FILES = '   > $TMP.csrclist
+printf 'F90_SRC_FILES = ' > $TMP.F90srclist
+printf 'H_SRC_FILES = '   > $TMP.hsrclist
+printf 'AD_FLOW_FILES = ' > $TMP.ad_flow_files
 alldirs="$SOURCEDIRS $INCLUDEDIRS ."
 for d in $alldirs ; do
     deplist=
@@ -2437,50 +2675,57 @@
 	sfiles=`( echo $sfiles | grep -v _cb2m\. )`
     fi
     for sf in $sfiles ; do
-	if test ! -r ".links.tmp/$sf" ; then
+	if test ! -r "$TMP.links/$sf" ; then
 	    if test -f "$d/$sf" ; then
 		ignore_f=f
-                case $d/$sf in
-                  ./$PACKAGES_DOT_H)
+		case $d/$sf in
+		  ./$PACKAGES_DOT_H)
 			ignore_f=t
 			;;
-                  ./AD_CONFIG.h)
+		  ./AD_CONFIG.h)
 			ignore_f=t
 			;;
-                  ./FC_NAMEMANGLE.h)
+		  ./FC_NAMEMANGLE.h)
 			ignore_f=t
 			;;
-                  ./BUILD_INFO.h)
+		  ./BUILD_INFO.h)
 			ignore_f=t
 			;;
-                  ./EMBEDDED_FILES.h)
+		  ./EMBEDDED_FILES.h)
 			ignore_f=t
 			;;
-                  *)
+		  *)
 			#  For the local directory *ONLY*,
 			#  ignore all soft-links
 			if test "x$HAVE_TEST_L" = xt -a "x$d" = x. -a -L $sf ; then
 			    ignore_f=t
 			else
-			    touch .links.tmp/$sf
+			    touch $TMP.links/$sf
 			    deplist="$deplist $sf"
 			fi
 			;;
-                esac
+		esac
 		if test "x$ignore_f" = xf ; then
 		    extn=`echo $sf | $AWK -F. '{print $NF}'`
 		    case $extn in
 		      F)
-			echo    " \\"  >> F77srclist.tmp
-			printf " $sf" >> F77srclist.tmp
-			if test "x$OPENAD" != x ; then
+			echo    " \\"  >> $TMP.F77srclist
+			printf " $sf" >> $TMP.F77srclist
+			if test "x$OPENAD" = x ; then
+			    basename=${sf%%.F}
+			    isAD=`egrep ^$basename.f'[ 	]*' $TMP.adSrcFiles`
+			    if test -z "$isAD" ; then
+				echo    " \\"  >> $TMP.nonADF77srclist
+				printf " $sf" >> $TMP.nonADF77srclist
+			    fi
+			else #- OpenAD case:
 			    basename=${sf%%.F}
-			    isAD=`egrep ^$basename.f'[ 	]*' adSrcFiles.tmp`
+			    isAD=`egrep ^$basename.f'[ 	]*' $TMP.adSrcFiles`
 			    if test -z "$isAD" ; then
 				toBeIgnored=`egrep ^$basename'[      ]*' ${OAD_DONT_COMPILE}`
 				if test -z "$toBeIgnored" ; then
-				    echo    " \\"  >> nonADF77srclist.tmp
-				    printf " $sf" >> nonADF77srclist.tmp
+				    echo    " \\"  >> $TMP.nonADF77srclist
+				    printf " $sf" >> $TMP.nonADF77srclist
 				else
 				    echo "    not to be compiled   :  $sf"
 				fi
@@ -2495,27 +2740,27 @@
 				    echo "    original to be kept  :  $sf"
 				fi
 				if test -n "$notToBeTransformed" -o -n "$untransformedVersionToBeKept" ; then
-				    echo    " \\"  >> nonADF77srclist.tmp
-				    printf " $sf" >> nonADF77srclist.tmp
+				    echo    " \\"  >> $TMP.nonADF77srclist
+				    printf " $sf" >> $TMP.nonADF77srclist
 				fi
 			    fi
 			fi
 			;;
 		    F90)
-			echo    " \\"  >> F90srclist.tmp
-			printf " $sf" >> F90srclist.tmp
+			echo    " \\"  >> $TMP.F90srclist
+			printf " $sf" >> $TMP.F90srclist
 			;;
 		    c)
-			echo    " \\"  >> csrclist.tmp
-			printf " $sf" >> csrclist.tmp
+			echo    " \\"  >> $TMP.csrclist
+			printf " $sf" >> $TMP.csrclist
 			;;
 		    h)
-			echo    " \\"  >> hsrclist.tmp
-			printf " $sf" >> hsrclist.tmp
+			echo    " \\"  >> $TMP.hsrclist
+			printf " $sf" >> $TMP.hsrclist
 			;;
-  		    flow)
-			echo    " \\"  >> ad_flow_files.tmp
-			printf " $sf" >> ad_flow_files.tmp
+		    flow)
+			echo    " \\"  >> $TMP.ad_flow_files
+			printf " $sf" >> $TMP.ad_flow_files
 			;;
 		   esac
 	        fi
@@ -2524,28 +2769,28 @@
     done
     if test "x$deplist" != x ; then
       if test "$d" != "." ; then
-  	echo "" >> srclinks.tmp
-	echo "#  These files are linked from $d" >> srclinks.tmp
-	echo "$deplist :" >> srclinks.tmp
+	echo "" >> $TMP.srclinks
+	echo "#  These files are linked from $d" >> $TMP.srclinks
+	echo "$deplist :" >> $TMP.srclinks
 # We need to make sure that the link isn't already there.
 # This may happen when make thinks that a header file has to be "remade"
 # because a module it depends on has changed.  In this case we do nothing.
-	printf "\tif [ ! -L \$@ ]; then \$(LN) %s/\$@ \$@; fi\n" $d >> srclinks.tmp
+	printf "\tif [ ! -L \$@ ]; then \$(LN) %s/\$@ \$@; fi\n" $d >> $TMP.srclinks
       fi
     fi
 done
-rm -rf .links.tmp
-echo "" >> F77srclist.tmp
-echo "" >> nonADF77srclist.tmp
-echo "" >> csrclist.tmp
-echo "" >> F90srclist.tmp
-echo "" >> hsrclist.tmp
-echo "" >> ad_flow_files.tmp
+rm -rf $TMP.links
+echo "" >> $TMP.F77srclist
+echo "" >> $TMP.nonADF77srclist
+echo "" >> $TMP.csrclist
+echo "" >> $TMP.F90srclist
+echo "" >> $TMP.hsrclist
+echo "" >> $TMP.ad_flow_files
 
 CMDLINE=$0
 for xx in "$@" ; do nw=`echo $xx | wc -w`
     if test $nw = '1' ; then CMDLINE="$CMDLINE $xx"
-                        else CMDLINE="$CMDLINE '$xx'" ; fi
+			else CMDLINE="$CMDLINE '$xx'" ; fi
 done
 
 if test -f $MAKEFILE ; then
@@ -2579,8 +2824,6 @@
 # INCLUDES     : Directories searched for header files
 # DEFINES      : Macro definitions for CPP
 # MAKEDEPEND   : Dependency generator
-# KPP          : Special preprocessor command (specific to platform)
-# KFLAGS       : Flags for KPP
 # FC           : Fortran compiler command
 # FFLAGS       : Configuration/debugging options for FC
 # FOPTIM       : Optimization options for FC
@@ -2594,6 +2837,7 @@
 EXEDIR      = ${EXEDIR}
 EXECUTABLE  = \$(EXEDIR)/${EXECUTABLE}
 TOOLSDIR    = ${TOOLSDIR}
+OADTOOLS    = ${OADTOOLS}
 
 #eh3  new defines for the adjoint work
 AUTODIFF    = ${ROOTDIR}/pkg/autodiff
@@ -2614,11 +2858,12 @@
     echo "EMBEDDED_FILES = " >>$MAKEFILE
 fi
 
+# extract default cpp search path so we can pass it to makedepend
+CPPINCLUDES=`cat /dev/null | $CPP -v 2>&1 | awk '/^End of search/{f=0}!/^\#/{if(f){printf " -I%s", $1;}}/^\#include "..." search start/{f=1}'`
+
 cat >>$MAKEFILE <<EOF
 # Unix ln (link)
 LN = ${LN}
-# C preprocessor
-CPP = cat \$< | ${S64} | ${CPP}
 # Dependency generator
 MAKEDEPEND = ${MAKEDEPEND}
 # Special preprocessor (KAP on DECs, FPP on Crays)
@@ -2636,6 +2881,8 @@
 DEFINES = ${DEFINES}
 # Includes for CPP
 INCLUDES = ${INCLUDES}
+# default CPP includes for makedepend
+CPPINCLUDES = ${CPPINCLUDES}
 # Flags for KPP
 KFLAGS1 = ${KFLAGS1}
 KFLAGS2 = ${KFLAGS2}
@@ -2653,19 +2900,21 @@
 NOOPTFLAGS = ${NOOPTFLAGS}
 # Flags and libraries needed for linking
 LIBS = ${LIBS}
-# Name of the Mekfile
-MAKEFILE=${MAKEFILE}
+# Name of the makefile
+MAKEFILE = ${MAKEFILE}
+# Name of the make program
+MAKE = ${MAKE}
 
 EOF
 
-cat F77srclist.tmp      >> $MAKEFILE
-cat nonADF77srclist.tmp >> $MAKEFILE
-cat csrclist.tmp        >> $MAKEFILE
-cat F90srclist.tmp      >> $MAKEFILE
-cat hsrclist.tmp        >> $MAKEFILE
-cat ad_flow_files.tmp   >> $MAKEFILE
+cat $TMP.F77srclist      >> $MAKEFILE
+cat $TMP.nonADF77srclist >> $MAKEFILE
+cat $TMP.csrclist        >> $MAKEFILE
+cat $TMP.F90srclist      >> $MAKEFILE
+cat $TMP.hsrclist        >> $MAKEFILE
+cat $TMP.ad_flow_files   >> $MAKEFILE
 
-rm -f F77srclist.tmp nonADF77srclist.tmp csrclist.tmp F90srclist.tmp hsrclist.tmp ad_flow_files.tmp
+rm -f $TMP.F77srclist $TMP.nonADF77srclist $TMP.csrclist $TMP.F90srclist $TMP.hsrclist $TMP.ad_flow_files
 
 echo >> $MAKEFILE
 
@@ -2678,20 +2927,28 @@
 echo 'F77_PP_SRC_FILES = $(F77_SRC_FILES:.F=.'$FS')'      >> $MAKEFILE
 echo 'F90_PP_SRC_FILES = $(F90_SRC_FILES:.F90=.'$FS90')' >> $MAKEFILE
 echo 'OBJFILES= $(F77_SRC_FILES:.F=.o) $(C_SRC_FILES:.c=.o) $(F90_SRC_FILES:.F90=.o)' >> $MAKEFILE
-echo 'FLOFILES =  $(AD_FLOW_FILES:.flow=.flowdir)' >> $MAKEFILE
+echo 'FLOWFILES =  $(AD_FLOW_FILES:.flow=.flowdir)' >> $MAKEFILE
 echo >> $MAKEFILE
 echo '.SUFFIXES:' >> $MAKEFILE
 echo '.SUFFIXES: .o .'$FS' .p .F .c .f'$FS90' .'$FS90' .FF90 .F90 .flowdir .flow' >> $MAKEFILE
 
 cat >>$MAKEFILE <<EOF
 
-all: \$(EXECUTABLE)
+all: fwd_exe_target
+fwd_exe_target:
+	@echo Update AD_CONFIG.h and make \$(EXECUTABLE)
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Forward version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+	@cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	@-rm -f ad_config.template
+	\$(MAKE) -f \$(MAKEFILE) \$(EXECUTABLE)
+
 \$(EXECUTABLE): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(OBJFILES) \$(EMBEDDED_FILES)
 	@echo Creating \$@ ...
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
+
 depend:
-	@make links
-	\$(MAKEDEPEND) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)
+	@\$(MAKE) -f \$(MAKEFILE) links
+	\$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(CPPINCLUDES) \$(F77_SRC_FILES)
 	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 	-rm -f makedepend.out
 
@@ -2701,6 +2958,8 @@
 	ar rcv libmitgcmuv.a \$(OBJFILES)
 	ar d   libmitgcmuv.a main.o
 
+obj: \$(OBJFILES)
+
 links: \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(SPECIAL_FILES)
 
 small_f: \$(F77_PP_SRC_FILES) \$(F90_PP_SRC_FILES)
@@ -2718,24 +2977,26 @@
 
 # remove most of the files that "make" and "make depend" generate
 Clean:
-	@make clean
-	@make cleanlinks
-	-rm -f \$(SPECIAL_FILES) f90mkdepend.log
-	-rm -f taf_command taf_output taf_ad.log taf_ad_flow.log
-	-rm -f genmake_warnings genmake_errors make.log
+	@\$(MAKE) -f \$(MAKEFILE) clean
+	@\$(MAKE) -f \$(MAKEFILE) cleanlinks
+	-rm -f \$(SPECIAL_FILES) f90mkdepend.log $MAKEFILE.old
+	-rm -f taf_command taf_output taf_ad.log taf_ad_flow.log taf_ftl.log
 
 # remove also the executable, files that "genmake2" generates (except Makefile)
 #         and output from a run (plus log files from testreport)
 CLEAN:
-	@make Clean
-	-rm -f \$(EXECUTABLE) \$(EXE_AD) *.bak $MAKEFILE.old
-	-rm -f $LOGFILE genmake_state genmake_*optfile genmake.tr_log make.tr_log
+	@\$(MAKE) -f \$(MAKEFILE) Clean
+	-rm -f \$(EXECUTABLE) \$(EXE_AD) \$(EXE_FTL) *.bak
+	-rm -f $LOGFILE genmake_state genmake_*optfile
+	-rm -f SIZE.h.mpi genmake.tr_log make.tr_log
+	-rm -rf mpi_headers mnc_test_*
 	-find \$(EXEDIR) -name "*.meta" -exec rm {} \;
 	-find \$(EXEDIR) -name "*.data" -exec rm {} \;
 	-find \$(EXEDIR) -name "fort.*" -exec rm {} \;
-	-rm -f *.txt STD* *diagnostics.log datetime
+	-rm -f *.txt STDOUT.* STDERR.* *diagnostics.log *.[0-9][0-9][0-9][0-9].log
+	-rm -f datetime costfinal divided.ctrl snapshot* output_adm.txt.diva_*
 	-rm -f *_MIT_CE_000.opt0000 costfunction*0000
-	-rm -rf mnc_test_*
+	-rm -f oad_cp.[0-9][0-9][0-9].?????
 
 makefile:
 	$THIS_SCRIPT $G2ARGS
@@ -2745,10 +3006,10 @@
 # Special targets (SPECIAL_FILES) which are created by make
 ${PACKAGES_DOT_H}:
 	@echo Creating \$@ ...
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@
 AD_CONFIG.h:
 	@echo Creating \$@ ...
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > \$@
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Default version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > \$@
 FC_NAMEMANGLE.h:
 	@echo Creating \$@ ...
 	echo "$FC_NAMEMANGLE" > \$@
@@ -2788,14 +3049,19 @@
 ## This nullifies any default implicit rules concerning these two file types:
 ## %.o : %.F
 
+# C preprocessing and replacing the _d in constants:
+CPPCMD = cat \$< | ${CPP} \$(DEFINES) \$(INCLUDES) | ${S64}
+
 .F.$FS:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+	\$(CPPCMD)  > \$@
 .$FS.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
+.F.o:
+	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
 .F90.$FS90:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+	\$(CPPCMD)  > \$@
 .FF90.f$FS90:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+	\$(CPPCMD)  > \$@
 .$FS90.o:
 	\$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
 .f$FS90.o:
@@ -2804,11 +3070,11 @@
 .c.o:
 	\$(CC) \$(CFLAGS) \$(DEFINES) \$(INCLUDES) -c \$<
 .flow.flowdir:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+	\$(CPPCMD) > \$@
 
 # Special exceptions that use the ( .F - .p - .$FS - .o ) rule-chain
 .F.p:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+	\$(CPPCMD) > \$@
 .p.$FS:
 	\$(KPP) \$(KFLAGS1)\$@ \$(KFLAGS2) \$<
 
@@ -2827,6 +3093,7 @@
 
 TAF_EXTRA      = ${TAF_EXTRA}
 TAMC_EXTRA     = ${TAMC_EXTRA}
+LOCAL_MPI_HEADERS    = ${LOCAL_MPI_HEADERS}
 
 EOF
 
@@ -2844,30 +3111,38 @@
 echo "  Add the source list for AD code generation"
 echo >> $MAKEFILE
 printf "AD_FILES = " >> $MAKEFILE
-AD_FILES=`cat adSrcFiles.tmp`
+AD_FILES=`cat $TMP.adSrcFiles`
 for i in $AD_FILES ; do
     echo    " \\" >> $MAKEFILE
     printf " $i" >> $MAKEFILE
 done
 echo >> $MAKEFILE
-rm -f adSrcFiles.tmp
+rm -f $TMP.adSrcFiles
 
 cat >>$MAKEFILE <<EOF
 
 # ... AD ...
-adall: \$(EXE_AD)
+adall: ad_exe_target
 adtaf: ad_taf_output.$FS
 adtamc: ad_tamc_output.$FS
 
-ad_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES) \$(AD_FLOW_FILES)
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ad_config.template
+ad_exe_target:
+	@echo Update AD_CONFIG.h and make \$(EXE_AD)
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Adjoint version" -bAD_CONFIG_H -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+	@cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	@-rm -f ad_config.template
+	\$(MAKE) -f \$(MAKEFILE) \$(EXE_AD)
+
+ad_input_code.$FS: \$(AD_FILES) \$(AD_FLOW_FILES)
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Adjoint version" -bAD_CONFIG_H -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
 	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
-	-rm -f ad_config.template
-	@make \$(F77_PP_SRC_FILES)
-	@make \$(FLOFILES)
-	cat \$(FLOFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
+	@-rm -f ad_config.template
+	@\$(MAKE) -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
+	@\$(MAKE) -f \$(MAKEFILE) \$(FLOWFILES)
+	cat \$(FLOWFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
 
 ad_taf_output.$FS: ad_input_code.$FS
+	@-rm -f ad_input_code_ad.$FS ; echo ''
 	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
 	ls -l ad_input_code_ad.$FS
 	cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
@@ -2877,8 +3152,8 @@
 	ls -l ad_input_code_ad.$FS
 	cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
 
-\${EXE_AD}: ad_taf_output.o \$(OBJFILES)
-	\$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS)
+\$(EXE_AD): \$(SPECIAL_FILES) \$(H_SRC_FILES) ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
+	\$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
 
 ad_tamc_output.$FS: ad_input_code.$FS
 	\$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
@@ -2893,31 +3168,41 @@
 adtrick:
 	patch < \$(TOOLSDIR)/ad_taf_output.f.adtrick.diff
 
+adobj: ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o)
+
 # ... FTL ...
-ftlall: ftl_taf
+ftlall: ftl_exe_target
 ftltaf: ftl_taf_output.$FS
 ftltamc: ftl_tamc_output.$FS
 
-ftl_input_code.$FS: \$(AD_FILES) \$(H_SRC_FILES)
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ftl_config.template
-	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
-	-rm -f ftl_config.template
-	@make \$(F77_PP_SRC_FILES)
-	@make \$(AD_FLOW_FILES)
-	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.$FS
+ftl_exe_target:
+	@echo Update AD_CONFIG.h and make \$(EXE_FTL)
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "TangLin version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
+	@cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	@-rm -f ad_config.template
+	\$(MAKE) -f \$(MAKEFILE) \$(EXE_FTL)
+
+ftl_input_code.$FS: \$(AD_FILES)
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "TangLin version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
+	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	@-rm -f ad_config.template
+	@\$(MAKE) -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
+	@\$(MAKE) -f \$(MAKEFILE) \$(AD_FLOW_FILES)
+	cat \$(AD_FLOW_FILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ftl_input_code.$FS
 
 ftl_taf_output.$FS: ftl_input_code.$FS
+	@-rm -f ftl_input_code_tl.$FS ; echo ''
 	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
-	ls -l ftl_input_code_ftl.$FS
-	cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
+	ls -l ftl_input_code_tl.$FS
+	cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
 
 ftltafonly:
 	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
-	ls -l ftl_input_code_ftl.$FS
-	cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
+	ls -l ftl_input_code_tl.$FS
+	cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
 
-ftl_taf: ftl_taf_output.o \$(OBJFILES)
-	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
+\$(EXE_FTL): \$(SPECIAL_FILES) \$(H_SRC_FILES) ftl_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
+	\$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) ftl_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
 
 ftl_tamc_output.$FS: ftl_input_code.$FS
 	\$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
@@ -2926,7 +3211,6 @@
 ftl_tamc: ftl_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_tamc_output.o \$(LIBS)
 
-
 # ... SVD ...
 svdtaf: ad_taf_output.$FS ftl_taf_output.$FS
 	@echo "--->>> Only ran TAF to generate SVD code!    <<<---"
@@ -2947,9 +3231,9 @@
 	touch ad_taf_output.$FS ftl_taf_output.$FS
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c ad_taf_output.$FS
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c ftl_taf_output.$FS
-	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > ftl_config.template
-	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
-	-rm -f ftl_config.template
+	@$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "SVD version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
+	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	@-rm -f ad_config.template
 
 EOF
 
@@ -3001,7 +3285,7 @@
   echo    " \\" >> $MAKEFILE
   printf " ${i}_mod.f$FS90" >> $MAKEFILE
 done
-AD_FILES=`cat adSrcFiles.tmp`
+AD_FILES=`cat $TMP.adSrcFiles`
 for i in $AD_FILES ; do
   basename=${i%%.f}
   toBeIgnored=`egrep ^$basename'[      ]*' ${OAD_DONT_COMPILE} ${OAD_DONT_TRANSFORM}`
@@ -3011,7 +3295,7 @@
   fi
 done
 echo >> $MAKEFILE
-rm -f adSrcFiles.tmp
+rm -f $TMP.adSrcFiles
 
 cat >>$MAKEFILE <<EOF
 
@@ -3024,7 +3308,7 @@
 
 .PHONY: adDepend
 adDepend: \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) \$(addsuffix _mod.FF90, \$(CB2M_F90_SRC_NAMES)) \$(F77_SRC_FILES:.F=_cb2m.FF90)
-	\$(MAKEDEPEND) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)
+	\$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)
 	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 	-rm -f makedepend.out
 
@@ -3033,7 +3317,8 @@
 OAD_active.F90 \
 OAD_cp.F90 \
 OAD_rev.F90 \
-OAD_tape.F90
+OAD_tape.F90 \
+revolve.F90
 
 OPENAD_SUPPORT_C_SRC_FILES = \
 iaddr.c \
@@ -3049,47 +3334,26 @@
 	f95 -fixed -w=unused -maxcontin=132 -c f95_test_mods.f90 > \$@ 2>&1
 	f95 -fixed -w=unused -maxcontin=132 -c -fixed f95_test.f90 >> \$@ 2>&1
 
-# the file included below is created by the
-# postProcessor and its inclusion sets the
-# variable POSTPROCESSEDFILES
-# used below. Because the file is made during
-# make it won't be read until the second (recursive)
-# invocation in the rule below
--include postProcess.make
+CB2M_AD_FILES=\$(AD_FILES:.f=_cb2m.f$FS90)
 
-AD_OBJ_FILES_S1=\$(OPENAD_SUPPORT_F90_SRC_FILES:.F90=.o) \$(OPENAD_SUPPORT_C_SRC_FILES:.c=.o) \$(POSTPROCESSEDFILES:.f$FS90=.o)
+AD_OBJ_FILES_S1=\$(OPENAD_SUPPORT_F90_SRC_FILES:.F90=.o) \$(OPENAD_SUPPORT_C_SRC_FILES:.c=.o)  OAD_intrinsics_oad.o \$(CB2M_AD_FILES:.f$FS90=_oad.o)
 
 AD_OBJ_FILES_S2=\$(AD_OBJ_FILES_S1) \$(NON_AD_F77_SRC_FILES:.F=_cb2m.o) \$(C_SRC_FILES:.c=.o) \$(F90_SRC_FILES:.F90=.o)
 
-postProcess.comp: \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) postProcess.tag \$(AD_OBJ_FILES_S1)
-ifeq (\$(MAKELEVEL),0)
-	\$(MAKE) adAll
-else
-	touch \$@
-endif
-
-\$(EXE_AD): \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) postProcess.comp \$(AD_OBJ_FILES_S2)
-ifeq (\$(MAKELEVEL),1)
+\$(EXE_AD): \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) postProcess.tag \$(AD_OBJ_FILES_S2)
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(AD_OBJ_FILES_S2) \$(LIBS)
-else
-	touch \$@
-endif
 
-# makefile debug rule
-openad: ad_input_code.w2f.pre.xb.x2w.w2f.td.pp.f$FS90
-.PHONY: openad
-
-# create the module files
-%_mod.FF90 : %.h ../OAD_support/cb2mGetModules.csh ../OAD_support/cb2mGetModules.awk
-	../OAD_support/cb2mGetModules.csh $< ../OAD_support/cb2mGetModules.awk
-
-# create the header files
-%_mod.h : %.h ../OAD_support/cb2mGetHeaders.csh ../OAD_support/cb2mGetHeaders.awk
-	../OAD_support/cb2mGetHeaders.csh $< ../OAD_support/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
-
-# change everybody else to use the new module files:
-%_cb2m.FF90 : %.F ../OAD_support/cb2mUseModules.bash
-	../OAD_support/cb2mUseModules.bash $< ${MPI}
+# create sources files modules from header files containing common blocks
+%_mod.FF90 : %.h \${OADTOOLS}/cb2mGetModules.csh \${OADTOOLS}/cb2mGetModules.awk
+	\${OADTOOLS}/cb2mGetModules.csh $< \${OADTOOLS}/cb2mGetModules.awk
+
+# create new header files with USE statements for the new modules made above
+%_mod.h : %.h \${OADTOOLS}/cb2mGetHeaders.csh \${OADTOOLS}/cb2mGetHeaders.awk
+	\${OADTOOLS}/cb2mGetHeaders.csh $< \${OADTOOLS}/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
+
+# change the include directives of everybody to refer to  the new header files with the USE statements
+%_cb2m.FF90 : %.F \${OADTOOLS}/cb2mUseModules.bash
+	\${OADTOOLS}/cb2mUseModules.bash $< ${MPI}
 
 # makefile debug rule
 small_f: \$(CB2M_F90_PP_SRC_FILES)
@@ -3102,93 +3366,59 @@
 	@printf 'running ... '
 	@./\$(EXE_AD) > \$@
 
-CB2M_AD_FILES=\$(AD_FILES:.f=_cb2m.f$FS90)
 ad_input_code.f$FS90:  \$(CB2M_AD_FILES)
 	cat \$^ > \$@
 
-# strip all comments and blanks to reduce
-# the file size in order to reduce perl's memory requirements
-ad_input_code_sf.f$FS90 : ad_input_code.f$FS90
-	cat \$^ | sed -f ../OAD_support/strip.sed | sed -f ../OAD_support/stop2print.sed > \$@
-
-# mfef90 preprocessing
-# expand statement functions
-# expose mfef90 specific substring handling
-# add the w2f__types module
-ad_input_code_sf.w2f.f$FS90: ad_input_code_sf.f$FS90 mfef90 whirl2f whirl2f_be w2f__types.f90
-	./mfef90 -r8 -z -F -N132 \$<
-	mv \$<.B \$(basename \$<).B
-	./whirl2f -openad \$(basename \$<).B
-	cat w2f__types.f90 \$(basename \$<).w2f.f > \$@
-
 # canonicalizer
-ad_input_code_sf.w2f.pre.f$FS90: ad_input_code_sf.w2f.f$FS90 preProcess.py
-	./preProcess.py --timing --r8 -H -S \$< -o \$@
+ad_input_code_sf.pre.f90 : \$(CB2M_AD_FILES)
+	\${OPENADFORTTK_BASE}/tools/SourceProcessing/preProcess.py --timing --r8 -H -S  -o \$@ \$^
+
+# replace stop statements (to avoid the implied unstructured control flow)  with print statements
+ad_input_code_sf.pre.s2p.f90 : ad_input_code_sf.pre.f90
+	cat \$< | sed -f \${OADTOOLS}/stop2print.sed > ad_input_code_sf.pre.s2p.f90
 
 # F -> WHIRL
-# note that the canonicalized version cuts off at col 72
-# doing this also for string constants which is ok as long
-# as we are in fixed mode and cut of exactly there.
-# Otherwise mfef90 patches in spaces to fill up to 72 (or 132)
-# characters respectively.
-ad_input_code_sf.w2f.pre.B: ad_input_code_sf.w2f.pre.f$FS90 mfef90
-	./mfef90 -r8 -z -F \$<
-	mv \$<.B \$@
+ad_input_code_sf.pre.s2p.B: ad_input_code_sf.pre.s2p.f90
+	\${OPEN64ROOT}/crayf90/sgi/mfef90 -r8 -z -F ad_input_code_sf.pre.s2p.f90
 
 # WHIRL -> XAIF
-ad_input_code_sf.w2f.pre.xaif : ad_input_code_sf.w2f.pre.B whirl2xaif
-	./whirl2xaif -s -n --debug 1 -o \$@ \$<
+ad_input_code_sf.pre.s2p.xaif : ad_input_code_sf.pre.s2p.B
+	\${OPENADFORTTK}/bin/whirl2xaif -s -n --debug 1 -o \$@ \$<
 
 # XAIF -> XAIF'
-ad_input_code_sf.w2f.pre.xb.xaif : ad_input_code_sf.w2f.pre.xaif xaif.xsd xaif_base.xsd xaif_inlinable_intrinsics.xsd xaif_derivative_propagator.xsd xaif_output.xsd oadDriver
-	./oadDriver -f -t forward_step -i \$< -c \${XAIFSCHEMAROOT}/schema/examples/inlinable_intrinsics.xaif -o \$@ -I -r
+ad_input_code_sf.pre.s2p.xb.xaif : ad_input_code_sf.pre.s2p.xaif xaif.xsd xaif_base.xsd xaif_inlinable_intrinsics.xsd xaif_derivative_propagator.xsd xaif_output.xsd
+	\${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/driver/oadDriver -f -t forward_step -i \$< -c \${XAIFSCHEMAROOT}/schema/examples/inlinable_intrinsics.xaif -o \$@ -I -r
 
 # XAIF' -> WHIRL'
-ad_input_code_sf.w2f.pre.xb.x2w.B : ad_input_code_sf.w2f.pre.xb.xaif xaif2whirl
-	./xaif2whirl --debug 1 ad_input_code_sf.w2f.pre.B \$<
+ad_input_code_sf.pre.s2p.xb.x2w.B : ad_input_code_sf.pre.s2p.xb.xaif
+	\${OPENADFORTTK}/bin/xaif2whirl --debug 1 ad_input_code_sf.pre.s2p.B \$<
 
 # WHIRL' -> F'
-ad_input_code_sf.w2f.pre.xb.x2w.w2f.f$FS90: ad_input_code_sf.w2f.pre.xb.x2w.B whirl2f whirl2f_be
-	./whirl2f -FLIST:ftn_file=\$@ -openad \$<
+ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.B
+	\${OPEN64ROOT}/whirl2f/whirl2f -FLIST:ftn_file=\$@ -openad \$<
 
 # insert template directives
-ad_input_code_sf.w2f.pre.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.w2f.pre.xb.x2w.w2f.f$FS90 ../OAD_support/insertTemplateDir.bash
-	../OAD_support/insertTemplateDir.bash \$< \$@
+ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90 \${OADTOOLS}/insertTemplateDir.bash
+	\${OADTOOLS}/insertTemplateDir.bash \$< \$@
 
-PPEXTRAS=\$(wildcard ../OAD_support/ad_template.*.F) ../OAD_support/ad_inline.F
+PPEXTRAS=\$(notdir \$(wildcard \${OADTOOLS}/ad_template.*.F)) ad_inline.F
 # postprocess F'
-postProcess.tag: ad_input_code_sf.w2f.pre.xb.x2w.w2f.td.f$FS90 postProcess.py \$(PPEXTRAS:.F=.f)
-	# the target is a placeholder to signal execution of the rule
+postProcess.tag: ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90 \$(PPEXTRAS:.F=.f) | w2f__types.f90
+	\${OPENADFORTTK_BASE}/tools/SourceProcessing/postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed --separateOutput --pathSuffix "" --filenameSuffix "_oad" -m r -i ad_inline.f \$<
+	# the target is a placeholder to trigger a single execution of the rule
 	touch \$@
-	# this step also creates the file postProcess.make but we cannot
-	# name it as the target or else make will try to remake it for
-	# the include directive above for any rule, e.g. make clean
-	./postProcess.py --progress --timing --outputFormat=fixed -m r -i ../OAD_support/ad_inline.f --width 4 \$<
+# put this so make knows about the postprocessing output
+OAD_intrinsics_oad.f \$(CB2M_AD_FILES:.f$FS90=_oad.f): postProcess.tag
 
-# setup some links
+# link the XAIF schema files
 %.xsd:
 	\$(LN) \${XAIFSCHEMAROOT}/schema/\$@ .
 
-mfef90:
-	\$(LN) \${OPEN64ROOT}/crayf90/sgi/mfef90 .
-
 # link the support files:
-\$(OPENAD_SUPPORT_F90_SRC_FILES) \$(OPENAD_SUPPORT_C_SRC_FILES):
-	\$(LN) ../OAD_support/\$@ .
-
-whirl2xaif xaif2whirl:
-	\$(LN) \${OPENADFORTTK}/bin/\$@ .
-
-preProcess.py postProcess.py:
-	\$(LN) \${OPENADFORTTK_BASE}/tools/SourceProcessing/\$@ .
+\$(OPENAD_SUPPORT_F90_SRC_FILES) \$(OPENAD_SUPPORT_C_SRC_FILES) \$(PPEXTRAS):
+	\$(LN) \${OADTOOLS}/\$@ .
 
-whirl2f whirl2f_be:
-	\$(LN) \${OPEN64ROOT}/whirl2f/\$@ .
-
-oadDriver:
-	\$(LN) \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/driver/oadDriver \$@
-
-AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.make postProcess.tag postProcess.comp \$(PPEXTRAS:.F=.f)
+AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.tag
 
 # ============ end OpenAD specific section ==============
 
@@ -3224,8 +3454,8 @@
 done
 
 echo "  Add rules for links"
-cat srclinks.tmp >> $MAKEFILE
-rm -f srclinks.tmp
+cat $TMP.srclinks >> $MAKEFILE
+rm -f $TMP.srclinks
 
 echo "  Adding makedepend marker"
 printf "\n\n# DO NOT DELETE\n" >> $MAKEFILE
@@ -3233,7 +3463,7 @@
 printf "\n===  Done  ===\n"
 
 # Create special header files
-$BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" $DISABLED_PACKAGES " " "Enabled packages:" $ENABLED_PACKAGES > $PACKAGES_DOT_H".tmp"
+$BASH $TOOLSDIR/convert_cpp_cmd2defines -bPACKAGES_CONFIG_H "Disabled packages:" $DISABLED_PACKAGES " " "Enabled packages:" $ENABLED_PACKAGES > $PACKAGES_DOT_H".tmp"
 if test ! -f $PACKAGES_DOT_H ; then
     mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
 else
@@ -3247,16 +3477,15 @@
     fi
 fi
 if test ! -f AD_CONFIG.h ; then
-    $BASH $TOOLSDIR/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN -UALLOW_ECCO_OPTIMIZATION > AD_CONFIG.h
+    $BASH $TOOLSDIR/convert_cpp_cmd2defines "Default version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > AD_CONFIG.h
 fi
 
-
 #  Write the "state" for future records
 if test "x$DUMPSTATE" = xt ; then
     printf "" > genmake_state
     for i in $gm_state ; do
 	t1="t2=\$$i"
 	eval $t1
-	echo "$i='$t2'" >> genmake_state
+	echo "$i='$t2'" | sed -e 's/  */ /g' >> genmake_state
     done
 fi