--- MITgcm/tools/genmake2	2004/03/16 18:20:34	1.73
+++ MITgcm/tools/genmake2	2007/10/08 07:33:28	1.165
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.73 2004/03/16 18:20:34 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.165 2007/10/08 07:33:28 mlosch Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -13,20 +13,28 @@
 test_for_package_in_cpp_options() {
     cpp_options=$1
     pkg=$2
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALLOW_$pkg" || exit 99
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_$pkg" || exit 99
-    test_for_string_in_file $cpp_options "^[ ]*#define.*DISABLE_$pkg" || exit 99
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*DISABLE_$pkg" || exit 99
+    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" || exit 99
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALLOW_USE_MPI" || exit 99
-    test_for_string_in_file $cpp_options "^[ ]*#define.*ALWAYS_USE_MPI" || exit 99
-    test_for_string_in_file $cpp_options "^[ ]*#undef.*ALWAYS_USE_MPI" || exit 99
+    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$"
 }
 
 # Search for particular string in a file. Return 1 if detected, 0 if not
@@ -39,7 +47,7 @@
     if test "x${RETVAL}" = x0 ; then
 	printf "Error: In $file there is an illegal line: "
         grep -i "$strng" $file
-	return 1
+	exit 99
     fi
     return 0
 }
@@ -67,11 +75,222 @@
 	done
 	PACKAGES=$new_packages
 	rm -f ./p[1,2].tmp
+	return $matched
     else
 	echo "Warning: can't read package groups definition file: $PKG_GROUPS"
     fi
 }
 
+#  Check for broken environments (eg. cygwin, MacOSX w/HFS+) that
+#  cannot distinguish [*.F/*.F90] from [*.f/*.f90] files.
+check_for_broken_Ff()  {
+    #  Do we have defaults for $FS and/or $FS90 ?
+    tfs=f
+    tfs9=f90
+    if test "x$FS" != x ; then
+	tfs="$FS"
+    fi
+    if test "x$FS90" != x ; then
+	tfs9="$FS90"
+    fi
+
+    #  First check the ability to create a *.F/.f pair.
+    cat <<EOF >> genmake_hello.F
+      program hello
+      write(*,*) 'hi'
+      stop
+      end
+EOF
+    cp genmake_hello.F "genmake_hello."$tfs > /dev/null 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" != x0 ; then
+	if test "x$FS" = x ; then
+	    FS='for'
+	    FS90='fr9'
+	    check_for_broken_Ff
+	else
+	    cat <<EOF 2>&1
+ERROR: Your file system cannot distinguish between *.F and *.f files 
+  (fails the "cp" 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
+	    exit -1
+	fi
+	return
+    fi
+    rm -f genmake_hello.*
+
+    #  Check the ability of ${MAKE} and ${LN} to use the current set
+    #  of extensions.
+    cat <<EOF >> genmake_hello.F
+      program hello
+      write(*,*) 'hi'
+      stop
+      end
+EOF
+    test -f $MAKEFILE  &&  mv -f $MAKEFILE $MAKEFILE".tst"
+    cat <<EOF >> $MAKEFILE
+.SUFFIXES:
+.SUFFIXES: .$tfs .F
+.F.$tfs:
+	$LN \$< \$@
+EOF
+    $MAKE "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
+	    FS='for'
+	    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
+	    exit -1
+	    return
+	fi
+    fi
+    rm -f genmake_hello.* $MAKEFILE
+    test -f $MAKEFILE".tst"  &&  mv -f $MAKEFILE".tst" $MAKEFILE
+
+    #  If we make it here, use the extensions
+    FS=$tfs
+    FS90=$tfs9
+    return
+}
+
+
+look_for_makedepend()  {
+
+    #  The "original" makedepend is part of the Imake system that is
+    #  most often distributed with XFree86 or with an XFree86 source
+    #  package.  As a result, many machines (eg. generic Linux) do not
+    #  have a system-default "makedepend" available.  For those
+    #  systems, we have two fall-back options:
+    #
+    #    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
+    #
+    #  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
+    #
+    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
+#   THIS IS A TEST MAKEFILE GENERATED BY "genmake2"
+#
+#   Some "makedepend" implementations will die if they cannot 
+#   find a Makefile -- so this file is here to gives them an 
+#   empty one to find and parse.
+EOF
+	cat <<EOF >> genmake_tc.f
+      program test
+      write(*,*) 'test'
+      stop
+      end
+EOF
+	makedepend genmake_tc.f > /dev/null 2>&1
+	RV1=$?
+	test -f $MAKEFILE  &&  rm -f $MAKEFILE
+	test -f $MAKEFILE".tst"  &&  mv -f $MAKEFILE".tst" $MAKEFILE
+	if test "x${RV0}${RV1}" = x00 ; then
+	    MAKEDEPEND=makedepend
+	else
+	    echo "    a system-default makedepend was not found."
+	    
+	    #  Try to build the cyrus implementation
+	    build_cyrus_makedepend
+	    RETVAL=$?
+	    if test "x$RETVAL" != x0 ; then
+		MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
+	    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()  {
+    rm -f ./genmake_cy_md
+    (
+	cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
+	    &&  ./configure > /dev/null 2>&1  \
+	    &&  make > /dev/null 2>&1
+	if test -x ./makedepend.exe ; then
+	    $LN ./makedepend.exe ./makedepend
+	fi
+	./makedepend ifparser.c > /dev/null 2>&1  \
+	    &&  echo "true"
+    ) > ./genmake_cy_md
+    grep true ./genmake_cy_md > /dev/null 2>&1
+    RETVAL=$?
+    rm -f ./genmake_cy_md
+    if test "x$RETVAL" = x0 ; then
+	MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
+	return 0
+    else
+	echo "WARNING: unable to build cyrus-imapd-makedepend"
+	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
+	    return 1
+        fi
+	clist="cc gcc c89 $CC"
+	for ic in $clist ; do 
+	    comm="$ic -o encode_files encode_files.c"
+	    ( cd $ROOTDIR/tools/embed_encode && $comm ) > /dev/null 2>&1
+	    RETVAL=$?
+	    if test "x$RETVAL" = x0 ; then
+		echo "OK"
+		DEFINES="$DEFINES -DHAVE_EMBED_SRC"
+		return 0
+	    fi
+	done
+	echo
+	echo "    Error: unable to build $ROOTDIR/embed_encode/encode_files"
+	echo "      so it has been disabled"
+	echo
+	EMBED_SRC=f
+	return 1
+    fi
+    echo "OK"
+    DEFINES="$DEFINES -DHAVE_EMBED_SRC"
+}
+
+
 # Guess possible config options for this host
 find_possible_configs()  {
 
@@ -82,6 +301,7 @@
     tmp2=`echo $tmp1 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`
     tmp3=`echo $tmp2 | sed -e 's/cray sv1/craysv1/'`
     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"
     
@@ -101,52 +321,50 @@
 	CPP="cpp -traditional -P"
     fi
 
-    #  The "original" makedepend is part of the Imake system that is
-    #  most often distributed with XFree86 or with an XFree86 source
-    #  package.  As a result, many machines (eg. generic Linux) do not
-    #  have a system-default "makedepend" available.  For those
-    #  systems, we have two fall-back options:
-    #
-    #    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
-    #
-    #  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
-    #
-    if test "x${MAKEDEPEND}" = x ; then
-      which makedepend > /dev/null 2>&1
-      RETVAL=$?
-      if test ! "x${RETVAL}" = x0 ; then
-         echo "    a system-default makedepend was not found."
-
-	 #  Try to build the cyrus impl
-	 rm -f ./genmake_cy_md
-	 (
-	     cd $ROOTDIR/tools/cyrus-imapd-makedepend  \
-		 &&  ./configure > /dev/null 2>&1  \
-		 &&  make > /dev/null 2>&1  \
-		 &&  ./makedepend ifparser.c > /dev/null 2>&1  \
-		 &&  echo "true"
-	 ) > ./genmake_cy_md
-	 grep true ./genmake_cy_md > /dev/null 2>&1
-	 RETVAL=$?
-	 if test "x$RETVAL" = x0 ; then
-	     MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend'
-	 else
-	     MAKEDEPEND='$(TOOLSDIR)/xmakedepend'
-	 fi
-	 rm -f ./genmake_cy_md
-      fi
+    look_for_makedepend
+
+    #================================================================
+    #  look for possible 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
+#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
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    p_CC="$p_CC $c"
+	fi
+    done
+    rm -f ./genmake_hello.c ./genmake_hello
+    if test "x${p_CC}" = x ; then
+	cat 1>&2 <<EOF
+
+Error: No C compilers were found in your path.  Please specify one using:
+
+    1) an "optfile" on (eg. "-optfile=path/to/OPTFILE"),
+    2) the CC or MITGCM_CC environment variables.
+
+EOF
+	exit 1
+    else
+	echo "  The possible C compilers found in your path are:"
+	echo "   "$p_CC
+	if test "x$CC" = x ; then
+	    CC=`echo $p_CC | $AWK '{print $1}'`
+	    echo "  Setting C compiler to: "$CC
+	fi
     fi
 
-    # look for possible fortran compilers
-    tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95"
+    #================================================================
+    #  look for possible FORTRAN compilers
+    tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc ifort f90 f95 mpif77 mpf77 mpxlf95 gfortran g95"
     p_FC=
     for c in $tmp ; do
 	rm -f ./hello.f ./hello
@@ -171,17 +389,25 @@
 
     1) an "optfile" on (eg. "-optfile=path/to/OPTFILE"),
     2) a command-line option (eg. "-fc NAME"), or
-    3) the MITGCM_FC environment variable.
+    3) the FC or MITGCM_FC environment variables.
 
 EOF
 	exit 1
     else
 	echo "  The possible FORTRAN compilers found in your path are:"
 	echo "   "$p_FC
-	if test "x$FC" = x ; then
-	    FC=`echo $p_FC | $AWK '{print $1}'`
-	    echo "  Setting FORTRAN compiler to: "$FC
-	fi
+    fi
+
+    #  Use the first of the compilers found in the current PATH
+    #  that has a correctly-named optfile
+    if test "x$OPTFILE" = x  -a  "x$FC" = x ; then
+	for i in $p_FC ; do
+	    OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
+	    if test -r $OPTFILE ; then
+		echo "  Setting OPTFILE to: "$OPTFILE
+		break
+	    fi
+	done
     fi
 
     if test "x$OPTFILE" = x ; then
@@ -273,6 +499,11 @@
     -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
@@ -337,17 +568,53 @@
           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.
 
+    -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.
+          set to PATH. i.e. Include files from \$PATH/include, link to libraries
+          from \$PATH/lib and use binaries from \$PATH/bin.
+
+    -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]
 
     -bash NAME
           Explicitly specify the Bourne or BASH shell to use
@@ -372,6 +639,12 @@
 
 #  Build a CPP macro to automate calling C routines from FORTRAN
 get_fortran_c_namemangling()  {
+
+    #echo "FC_NAMEMANGLE = \"$FC_NAMEMANGLE\""
+    if test ! "x$FC_NAMEMANGLE" = x ; then
+        return 0
+    fi
+
     default_nm="#define FC_NAMEMANGLE(X) X ## _"
     
     cat > genmake_test.c <<EOF
@@ -389,7 +662,7 @@
 EOF
 	return 1
     fi
-    c_tcall=`nm genmake_test.o | grep 'T ' | grep tcall | cut -d ' ' -f 3`
+    c_tcall=`nm genmake_test.o 2>/dev/null | grep 'T ' | grep tcall | cut -d ' ' -f 3`
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -401,13 +674,13 @@
 EOF
 	return 1
     fi
-    cat > genmake_tcomp.f <<EOF
+    cat > genmake_tcomp.$FS <<EOF
       subroutine tcall( string )
       character*(*) string
       call tsub( string )
       end
 EOF
-    $FC $FFLAGS $DEFINES -c genmake_tcomp.f >> genmake_warnings 2>&1
+    $FC $FFLAGS -c genmake_tcomp.$FS >> genmake_warnings 2>&1
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -419,7 +692,7 @@
 EOF
 	return 1
     fi
-    f_tcall=`nm genmake_tcomp.o | grep 'T ' | grep tcall | cut -d ' ' -f 3`
+    f_tcall=`nm genmake_tcomp.o 2>/dev/null | grep 'T ' | grep tcall | cut -d ' ' -f 3`
     RETVAL=$?
     if test "x$RETVAL" != x0 ; then
 	FC_NAMEMANGLE=$default_nm
@@ -473,19 +746,21 @@
  *curtim = *curtim/1.E6;
 }
 EOF
-    make genmake_tc_1.o >> genmake_tc.log 2>&1
+    make genmake_tc_1.o >> genmake_warnings 2>&1
     RET_C=$?
-    cat <<EOF > genmake_tc_2.f
+    cat <<EOF > genmake_tc_2.$FS
       program hello
-      Real*8 wtime
+      REAL*8 wtime
       external cloc
       call cloc(wtime)
       print *," HELLO WORLD", wtime
-      end program hello
+      end
 EOF
-    $FC $FFLAGS -o genmake_tc genmake_tc_2.f genmake_tc_1.o >> genmake_tc.log 2>&1
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
     RET_F=$?
-    test -x ./genmake_tc  &&  ./genmake_tc >> genmake_tc.log 2>&1
+    test -x ./genmake_tc  &&  ./genmake_tc >> genmake_warnings 2>&1
     RETVAL=$?
     if test "x$RETVAL" = x0 ; then
 	HAVE_CLOC=t
@@ -495,10 +770,171 @@
 }
 
 
+check_HAVE_SIGREG()  {
+    if test ! "x$HAVE_SIGREG" = x ; then
+	return
+    fi
+    get_fortran_c_namemangling
+    cat <<EOF > genmake_tc_1.c
+$FC_NAMEMANGLE
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+#include <errno.h>
+#include <ucontext.h>
+
+int * ip;
+
+static void killhandler(
+    unsigned int sn, siginfo_t  si, struct ucontext *sc )
+{
+    *ip = *ip + 1;
+    return;
+}
+
+void FC_NAMEMANGLE(sigreg) (int * aip)
+{
+    struct sigaction s;
+    ip = aip;
+    s.sa_flags = SA_SIGINFO;
+    s.sa_sigaction = (void *)killhandler;
+    if(sigaction (SIGTERM,&s,(struct sigaction *)NULL)) {
+	printf("Sigaction returned error = %d\n", errno);
+	exit(0);
+    }
+    return;
+}
+EOF
+    make genmake_tc_1.o >> genmake_warnings 2>&1
+    RET_C=$?
+    cat <<EOF > genmake_tc_2.$FS
+      program hello
+      integer anint
+      common /iv/ anint
+      external sigreg
+      call sigreg(anint)
+      end
+EOF
+    echo >> genmake_warnings
+    echo "running: check_HAVE_SIGREG()" >> genmake_warnings
+    cat genmake_tc_2.$FS >> genmake_warnings
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" = x0 ; then
+	HAVE_SIGREG=t
+	DEFINES="$DEFINES -DHAVE_SIGREG"
+    fi
+    rm -f genmake_tc*
+}
+
+
+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
+    get_fortran_c_namemangling
+    cat <<EOF > genmake_tc_1.c
+$FC_NAMEMANGLE
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <unistd.h>
+void FC_NAMEMANGLE(setrlstk) ()
+{
+    struct rlimit rls;
+    rls.rlim_cur = RLIM_INFINITY;
+    rls.rlim_max = RLIM_INFINITY;
+    setrlimit(RLIMIT_STACK, &rls);
+    return;
+}
+EOF
+    make genmake_tc_1.o >> genmake_warnings 2>&1
+    RET_C=$?
+    cat <<EOF > genmake_tc_2.$FS
+      program hello
+      external setrlstk
+      call setrlstk()
+      end
+EOF
+    echo >> genmake_warnings
+    echo "running: check_HAVE_SETRLSTK()" >> genmake_warnings
+    cat genmake_tc_2.$FS >> genmake_warnings
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_warnings 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" = x0 ; then
+	HAVE_SETRLSTK=t
+	DEFINES="$DEFINES -DHAVE_SETRLSTK"
+    fi
+    rm -f genmake_tc*
+}
+
+
+check_HAVE_STAT()  {
+    get_fortran_c_namemangling
+    cat <<EOF > genmake_tc_1.c
+$FC_NAMEMANGLE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+void FC_NAMEMANGLE(tfsize) ( int *nbyte )
+{
+    char name[512];
+    struct stat astat;
+
+    name[0] = 'a'; name[1] = '\0';
+    if (! stat(name, &astat))
+        *nbyte = (int)(astat.st_size);
+    else
+        *nbyte = -1;
+}
+EOF
+    make genmake_tc_1.o >> genmake_tc.log 2>&1
+    RET_C=$?
+    cat <<EOF > genmake_tc_2.$FS
+      program hello
+      integer nbyte
+      call tfsize(nbyte)
+      print *," HELLO WORLD", nbyte
+      end
+EOF
+    echo >> genmake_warnings
+    echo "running: check_HAVE_STAT()" >> genmake_warnings
+    cat genmake_tc_2.$FS >> genmake_warnings
+    COMM="$FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o"
+    echo $COMM >> genmake_warnings
+    $COMM >> genmake_tc.log 2>&1
+    RETVAL=$?
+    if test "x$RETVAL" = x0 ; then
+	HAVE_STAT=t
+	DEFINES="$DEFINES -DHAVE_STAT"
+    fi
+    rm -f genmake_tc*
+}
+
+
 check_netcdf_libs()  {
+    if test ! "x$SKIP_NETCDF_CHECK" = x ; then
+	return
+    fi
+    echo >> genmake_warnings
+    echo "running: check_netcdf_libs()" >> genmake_warnings
     cat <<EOF > genmake_tnc.F
       program fgennc
 #include "netcdf.inc"
+EOF
+    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)
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
@@ -508,26 +944,64 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    $CPP genmake_tnc.F > genmake_tnc.f  \
-	&&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f $LIBS >> genmake_tnc.log 2>&1
+    echo "===  genmake_tnc.F  ===" > genmake_tnc.log
+    cat genmake_tnc.F >> genmake_tnc.log
+    echo "===  genmake_tnc.F  ===" >> genmake_tnc.log
+    RET_CPP=f
+    COMM="cat genmake_tnc.F | $CPP $DEFINES $INCLUDES"
+    echo "$COMM" >> genmake_tnc.log
+    eval $COMM > genmake_tnc.$FS 2>/dev/null  &&  RET_CPP=t
+    if test "x$RET_CPP" = xf ; then
+	echo "  WARNING: CPP failed to pre-process the netcdf test." \
+	    >> genmake_tnc.log
+	echo "    Please check that \$INCLUDES is properly set." \
+	    >> genmake_tnc.log
+    fi
+    echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.$FS  \ " >> genmake_tnc.log
+    echo "  &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc.o $LIBS" >> genmake_tnc.log
+    $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
+	&&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
-    test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
-    RETVAL=$?
-    if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+    cat genmake_tnc.log >> genmake_warnings
+
+    #EH3  Remove test program execution for machines that either disallow
+    #EH3  execution or cannot support it (eg. cross-compilers)
+    #EH3
+    #EH3 test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
+    #EH3 RETVAL=$?
+    #EH3 if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+
+    if test "x$RET_COMPILE" = x0 ; then
 	HAVE_NETCDF=t
     else
 	# try again with "-lnetcdf" added to the libs
-	$CPP genmake_tnc.F > genmake_tnc.f  \
-	    &&  $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \
-	    $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1
+	echo "try again with added '-lnetcdf'" > genmake_tnc.log
+	echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log
+	echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+	echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
+	cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null  \
+	    &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
+	    &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1
 	RET_COMPILE=$?
-	test -x ./genmake_tnc  &&  ./genmake_tnc >> genmake_tnc.log 2>&1
-	RETVAL=$?
-	if test "x$RET_COMPILE" = x0 -a "x$RETVAL" = x0 ; then
+	cat genmake_tnc.log >> genmake_warnings
+	if test "x$RET_COMPILE" = x0 ; then
 	    LIBS="$LIBS -lnetcdf"
 	    HAVE_NETCDF=t
 	else
+	# try again with "-lnetcdff" added to the libs
+	    echo "try again with added '-lnetcdff -lnetcdf'" > genmake_tnc.log
+	    echo "cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS \ " >> genmake_tnc.log
+	    echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS \ " >> genmake_tnc.log
+	    echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf" >> genmake_tnc.log
+	    cat genmake_tnc.F | $CPP $DEFINES $INCLUDES > genmake_tnc.$FS 2>/dev/null  \
+		&&  $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1  \
+		&&  $LINK $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.o $LIBS -lnetcdff -lnetcdf >> genmake_tnc.log 2>&1
+	    RET_COMPILE=$?
 	    cat genmake_tnc.log >> genmake_warnings
+	    if test "x$RET_COMPILE" = x0 ; then
+		LIBS="$LIBS -lnetcdff -lnetcdf"
+		HAVE_NETCDF=t
+	    fi
 	fi
     fi
     rm -f genmake_tnc*
@@ -546,22 +1020,24 @@
 LN=
 S64=
 KPP=
-FC=
-CPP=
+#FC=
+#CC=gcc
+#CPP=
 LINK=
 DEFINES=
 PACKAGES=
 ENABLE=
 DISABLE=
-MAKEFILE=
-MAKEDEPEND=
+# MAKEFILE=
+# MAKEDEPEND=
 PDEPEND=
 DUMPSTATE=t
 PDEFAULT=
 OPTFILE=
-INCLUDES="-I."
+INCLUDES="-I. $INCLUDES"
 FFLAGS=
 FOPTIM=
+FEXTRAFLAGS=
 CFLAGS=
 KFLAGS1=
 KFLAGS2=
@@ -572,13 +1048,27 @@
 NOOPTFLAGS=
 MPI=
 MPIPATH=
+TS=
+PAPIS=
+PCLS=
+FOOLAD=
+PAPI=
+PCL=
+HPMT=
+GSL=
+DEVEL=
+HAVE_TEST_L=
 
-# DEFINES checked by test compilation
+# DEFINES checked by test compilation or command-line
 HAVE_SYSTEM=
 HAVE_FDATE=
 FC_NAMEMANGLE=
 HAVE_CLOC=
+# HAVE_SETRLSTK=
+HAVE_STAT=
 HAVE_NETCDF=
+HAVE_ETIME=
+IGNORE_TIME=
 
 MODS=
 TOOLSDIR=
@@ -589,11 +1079,14 @@
 G2ARGS=
 BASH=
 PWD=`pwd`
-MAKE=make
-AWK=awk
-THISHOSTNAME=`hostname`
+test "x$MAKE" = x  &&  MAKE=make
+test "x$AWK" = x   &&  AWK=awk
+EMBED_SRC=
+THISHOST=`hostname`
 THISCWD=`pwd`
 THISDATE=`date`
+THISUSER=`echo $USER`
+THISVER=
 MACHINE=`uname -a`
 EXECUTABLE=
 EXEHOOK=
@@ -603,6 +1096,8 @@
 if test "x$MITGCM_IEEE" != x ; then
     IEEE=$MITGCM_IEEE
 fi
+FS=
+FS90=
 
 AUTODIFF_PKG_USED=f
 AD_OPTFILE=
@@ -620,14 +1115,14 @@
 
 #  The following state can be set directly by command-line switches
 gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE"
-gm_s2="FC CPP IEEE MPI JAM DUMPSTATE STANDARDDIRS"
+gm_s2="FC CPP IEEE TS PAPIS PCLS PAPI PCL HPMT GSL DEVEL MPI JAM DUMPSTATE STANDARDDIRS"
 
 #  The following state is not directly set by command-line switches
-gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM "
+gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM FEXTRAFLAGS"
 gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS"
-gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOSTNAME THISDATE MACHINE"
+gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOST THISUSER THISDATE THISVER MACHINE"
 gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
-gm_s7="HAVE_SYSTEM HAVE_FDATE FC_NAMEMANGLE"
+gm_s7="HAVE_SYSTEM HAVE_FDATE FC_NAMEMANGLE HAVE_ETIME"
 
 #  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"
@@ -657,7 +1152,7 @@
     fi
 done
 printf "  getting local config information:  "
-if test -e $gm_local ; then
+if test -f $gm_local ; then
     echo "using $gm_local"
     . $gm_local
     # echo "DISABLE=$DISABLE"
@@ -666,7 +1161,7 @@
     echo "none found"
 fi
 
-#  echo "$0::$1:$2:$3:$4:$5:$6:$7:"
+#echo "$0::$1:$2:$3:$4:$5:$6:$7:"
 #OPTIONS=
 #n=0
 #for i ; do 
@@ -678,7 +1173,7 @@
 #done
 #parse_options
 ac_prev=
-for ac_option ; do
+for ac_option in "$@" ; do
 
     G2ARGS="$G2ARGS \"$ac_option\""
 
@@ -774,17 +1269,53 @@
 #		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= ;;
 
+	-ts | --ts)
+	    TS=true ;;
+	-papis | --papis)
+	    PAPIS=true ;;
+	-pcls | --pcls)
+	    PCLS=true ;;
+	-foolad | --foolad)
+	    FOOLAD=true ;;
+	-papi | --papi)
+	    PAPI=true ;;
+	-pcl | --pcl)
+	    PCL=true ;;
+	-hpmt | --hpmt)
+	    HPMT=true ;;
+
+        -gsl | --gsl)
+	    GSL=true ;;
+
+        -devel | --devel)
+	    DEVEL=true ;;
+
 	-mpi | --mpi)
 	    MPI=true ;;
 	-mpi=* | --mpi=*)
@@ -808,6 +1339,12 @@
 	    ac_prev=TAMC_EXTRA ;;
 	-tamc_extra=* | --tamc_extra=*)
 	    TAMC_EXTRA=$ac_optarg ;;
+	
+	-ignoretime | -ignore_time | --ignoretime | --ignore_time)
+	    IGNORE_TIME="-DIGNORE_TIME" ;;
+
+	-es | --es | -embed-source | --embed-source)
+	    EMBED_SRC=t ;;
 
 	-*)
 	    echo "Error: unrecognized option: "$ac_option
@@ -823,20 +1360,22 @@
     
 done
 
+
 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.  Please see:"
-    echo 
+    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
-    echo "  for directions on how to setup and use the new \"genmake2\" input"
-    echo "  files and send an email to MITgcm-support@mitgcm.org if you want help."
+    echo "  and send an email to MITgcm-support@mitgcm.org if you need help."
+    echo "WARNING: ignore \"./.genmakerc\" and continue."
     echo 
 fi
 
+#  Find the MITgcm ${ROOTDIR}
 if test "x${ROOTDIR}" = x ; then
-    if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
+    if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesupp -a -d ../pkg ; then
 	ROOTDIR=".."
     else
 	for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
@@ -860,6 +1399,15 @@
     exit 1
 fi
 
+#  Find the MITgcm ${THISVER}
+if test -f "${ROOTDIR}/doc/tag-index" ; then
+    THISVER=`grep '^checkpoint' ${ROOTDIR}/doc/tag-index | head -1`
+fi
+
+if test "x$MAKEFILE" = x ; then
+    MAKEFILE="Makefile"
+fi
+
 echo "  getting OPTFILE information:  "
 if test "x${OPTFILE}" = x ; then
     if test "x$MITGCM_OF" = x ; then
@@ -916,7 +1464,10 @@
     fi
 fi
 
-#  Check that FC, LINK, CPP, S64, LN, and MAKE are defined.  If not,
+#====================================================================
+#  Set default values if not set by the optfile
+#
+#  Check that FC, CC, LINK, CPP, S64, LN, and MAKE are defined.  If not,
 #  either set defaults or complain and abort!
 if test ! "x$BASH" = x ; then
     # add a trailing space so that it works within the Makefile syntax (see below)
@@ -932,6 +1483,16 @@
 EOF
     exit 1
 fi
+if test "x$CC" = x ; then
+    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
     LINK=$FC
 fi
@@ -942,8 +1503,8 @@
     CPP=cpp
 fi
 #EH3 === UGLY ===
-#  The following an ugly little hack to check for $CPP in /lib/ and it
-#  should eventually be replaced with a more general function that
+#  The following is an ugly little hack to check for $CPP in /lib/ and
+#  it should eventually be replaced with a more general function that
 #  searches a combo of the user's path and a list of "usual suspects"
 #  to find the correct location for binaries such as $CPP.
 for i in " " "/lib/" ; do
@@ -966,9 +1527,7 @@
 else
     rm -f test_cpp
 fi
-if test "x$MAKEDEPEND" = x ; then
-    MAKEDEPEND=makedepend
-fi
+look_for_makedepend
 if test "x$LN" = x ; then
     LN="ln -s"
 fi
@@ -984,21 +1543,110 @@
 EOF
     exit 1
 fi
+test -L genmake_tlink > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    HAVE_TEST_L=t
+fi
 rm -f genmake_test_ln genmake_tlink
 
+#  Check for broken *.F/*.f handling and fix if possible
+check_for_broken_Ff
+
 if test ! "x$MPI" = x ; then
       echo "  Turning on MPI cpp macros"
       DEFINES="$DEFINES -DALLOW_USE_MPI -DALWAYS_USE_MPI"
 fi
 
+if test ! "x$TS" = x ; then
+      echo "  Turning on timing per timestep"
+      if test ! "x$FOOLAD" = x ; then
+            DEFINES="$DEFINES -DTIME_PER_TIMESTEP_SFP"
+      else
+	    DEFINES="$DEFINES -DTIME_PER_TIMESTEP"
+      fi
+      PACKAGES="$PACKAGES showflops"
+fi
+if test ! "x$PAPIS" = x ; then
+      echo "  Turning on PAPI flop summary per timestep"
+      echo "  Please make sure PAPIINC, PAPILIB are defined"
+      if test ! "x$FOOLAD" = x ; then
+	    DEFINES="$DEFINES -DUSE_PAPI_FLOPS_SFP"
+      else
+	    DEFINES="$DEFINES -DUSE_PAPI_FLOPS"
+      fi
+      INCLUDES="$INCLUDES $PAPIINC"
+      LIBS="$LIBS $PAPILIB"
+      PACKAGES="$PACKAGES showflops"
+fi
+if test ! "x$PCLS" = x ; then
+      echo "  Turning on PCL counter summary per timestep"
+      echo "  Please make sure PCLINC, PCLLIB are defined"
+      if test ! "x$FOOLAD" = x ; then
+	    DEFINES="$DEFINES -DUSE_PCL_FLOPS_SFP"
+      else
+	    DEFINES="$DEFINES -DUSE_PCL_FLOPS"
+      fi
+      INCLUDES="$INCLUDES $PCLINC"
+      LIBS="$LIBS $PCLLIB"
+      PACKAGES="$PACKAGES showflops"
+fi
+if test ! "x$PAPI" = x ; then
+      if test ! "x$PAPIS" = x ; then
+	  echo "  PAPI performance analysis and flop summary per timestep cannot co-exist!"
+	  echo "  Sticking with PAPI flop summary per timestep!"
+      else
+	  echo "  Turning on performance analysis with PAPI"
+          echo "  Please make sure PAPIINC, PAPILIB are defined"
+	  DEFINES="$DEFINES -DUSE_PAPI"
+	  INCLUDES="$INCLUDES $PAPIINC"
+	  LIBS="$LIBS $PAPILIB"
+      fi
+fi
+if test ! "x$PCL" = x ; then
+      if test ! "x$PCLS" = x ; then
+	  echo "  PCL performance analysis and flop summary per timestep cannot co-exist!"
+	  echo "  Sticking with PCL flop summary per timestep!"
+      else
+	  echo "  Turning on performance analysis with PCL"
+          echo "  Please make sure PCLINC, PCLLIB are defined"
+	  DEFINES="$DEFINES -DUSE_PCL"
+	  INCLUDES="$INCLUDES $PCLINC"
+	  LIBS="$LIBS $PCLLIB"
+      fi
+fi
+if test ! "x$HPMT" = x ; then
+      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
+	  echo "  PCL and the HPM Toolkit cannot co-exist!"
+	  echo "  Sticking with PCL!"
+      else
+	  echo "  Turning on performance analysis with the HPM Toolkit"
+          echo "  Please make sure HPMTINC, HPMTLIB are defined"
+	  DEFINES="$DEFINES -DUSE_LIBHPM"
+          INCLUDES="$INCLUDES $HPMTINC"
+	  LIBS="$LIBS $HPMTLIB"
+      fi
+      fi
+fi
+if test ! "x$GSL" = x ; then
+      echo "  Turning on use of GSL to control floating point calculations"
+      echo "  Please make sure GSLINC, GSLLIB are defined"
+      DEFINES="$DEFINES -DUSE_GSL_IEEE"
+      INCLUDES="$INCLUDES $GSLINC"
+      LIBS="$LIBS $GSLLIB"
+fi
+
 printf "\n===  Checking system libraries  ===\n"
 printf "  Do we have the system() command using $FC...  "
-cat > genmake_tcomp.f <<EOF
+cat > genmake_tcomp.$FS <<EOF
       program hello
       call system('echo hi')
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.f > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_SYSTEM=t
@@ -1011,15 +1659,15 @@
 rm -f genmake_tcomp*
 
 printf "  Do we have the fdate() command using $FC...  "
-cat > genmake_tcomp.f <<EOF
+cat > genmake_tcomp.$FS <<EOF
       program hello
-      CHARACTER(128) string
+      CHARACTER*(128) string
       string = ' '
       call fdate( string )
       print *, string
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.f > genmake_tcomp.log 2>&1
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_FDATE=t
@@ -1031,12 +1679,66 @@
 fi
 rm -f genmake_tcomp*
 
+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
+      end
+EOF
+$FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    HAVE_ETIME=t
+    DEFINES="$DEFINES -DHAVE_ETIME"
+    echo "yes"
+else
+    HAVE_ETIME=
+    echo "no"
+fi
+rm -f genmake_tcomp*
+
 printf "  Can we call simple C routines (here, \"cloc()\") using $FC...  "
 check_HAVE_CLOC
 if test "x$HAVE_CLOC" != x ; then
     echo "yes"
 else
     echo "no"
+    if test "x$EMBED_SRC" = xt ; then
+	echo "    WARNING: you requested file embedding but it has"
+	echo "      been disabled since C code cannot be called"
+	EMBED_SRC=
+    fi
+fi
+rm -f genmake_t*
+
+printf "  Can we unlimit the stack size using $FC...  "
+check_HAVE_SETRLSTK
+if test "x$HAVE_SETRLSTK" = xt ; then
+    echo "yes"
+else
+    echo "no"
+fi
+rm -f genmake_t*
+
+printf "  Can we register a signal handler using $FC...  "
+check_HAVE_SIGREG
+if test "x$HAVE_SIGREG" = xt ; then
+    echo "yes"
+else
+    echo "no"
+fi
+rm -f genmake_t*
+
+printf "  Can we use stat() through C calls...  "
+check_HAVE_STAT
+if test "x$HAVE_STAT" != x ; then
+    echo "yes"
+else
+    echo "no"
 fi
 rm -f genmake_t*
 
@@ -1047,6 +1749,14 @@
 else
     echo "no"
 fi
+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"
+fi
 
 
 printf "\n===  Setting defaults  ===\n"
@@ -1064,15 +1774,13 @@
 done
 echo
 
-if test "x$MAKEFILE" = x ; then
-    MAKEFILE="Makefile"
-fi
 if test "x${PLATFORM}" = x ; then
     PLATFORM=$p_PLATFORM
 fi
 
 if test "x${EXEDIR}" = x ; then
-    if test "${PWD##/*/}" = "bin" -a -d ../exe -a $ROOTDIR = .. ; then
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
+    if test "x$tmp" = "xbin" -a -d ../exe -a $ROOTDIR = .. ; then
 	EXEDIR=../exe
     else
 	EXEDIR=.
@@ -1091,7 +1799,30 @@
     exit 1
 fi
 if test "x$S64" = x ; then
-    S64='$(TOOLSDIR)/set64bitConst.sh'
+    echo "3.0 _d 3" | ${TOOLSDIR}/set64bitConst.sh > /dev/null 2>&1
+    RETVAL=$?
+    if test "x${RETVAL}" = x0 ; then
+	S64='$(TOOLSDIR)/set64bitConst.sh'
+    else
+	echo "3.0 _d 3" | ${TOOLSDIR}/set64bitConst.csh > /dev/null 2>&1
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    S64='$(TOOLSDIR)/set64bitConst.csh'
+	else
+	    cat <<EOF
+
+ERROR: neither of the two default scripts:
+
+    ${TOOLSDIR}/set64bitConst.sh
+    ${TOOLSDIR}/set64bitConst.csh
+
+  are working so please check paths or specify (with \$S64) a 
+  working version of this script.
+
+EOF
+	    exit 1
+	fi
+    fi
 fi
 THIS_SCRIPT=`echo ${0} | sed 's:'$TOOLSDIR':\$(TOOLSDIR):'`
 
@@ -1113,19 +1844,21 @@
     fi
 fi
 
-#same for exch2
-if test -r $ROOTDIR"/pkg/exch2/Makefile" ; then
-    echo "  Making source files in exch2 from  templates"
-    ( cd $ROOTDIR"/pkg/exch2/" && $MAKE ) > make_exch2.errors 2>&1
-    RETVAL=$?
-    if test "x${RETVAL}" = x0 ; then
-        rm -f make_exch2.errors
-    else
-        echo "Error: problem encountered while building source files in exch2:"
-        cat make_exch2.errors 1>&2
-        exit 1
+#same for pkg/exch2 and pkg/regrid
+for pdir in exch2 regrid ; do
+    if test -r $ROOTDIR"/pkg/${pdir}/Makefile" ; then
+	echo "  Making source files in pkg/${pdir} from templates"
+	( cd $ROOTDIR"/pkg/"${pdir} && $MAKE ) > make_${pdir}.errors 2>&1
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    rm -f make_${pdir}.errors
+	else
+	    echo "Error: problem encountered while building source files in pkg/${pdir}:"
+	    cat make_${pdir}.errors 1>&2
+	    exit 1
+	fi
     fi
-fi
+done
 
 printf "\n===  Determining package settings  ===\n"
 if  test "x${PDEPEND}" = x ; then
@@ -1190,12 +1923,20 @@
 	    PACKAGES="$PACKAGES $i"
 	done
 	echo "    before group expansion packages are: $PACKAGES"
-	expand_pkg_groups
+	RET=1
+        while test $RET = 1 ; do expand_pkg_groups; RET=$?; done
 	echo "    after group expansion packages are:  $PACKAGES"
     fi
 fi
 
 echo "  applying DISABLE settings"
+for i in $PACKAGES ; do
+    echo $i >> ./.tmp_pack
+done
+for i in `grep  "-" ./.tmp_pack` ; do
+    j=`echo $i | sed 's/[-]//'`
+    DISABLE="$DISABLE $j"
+done
 pack=
 for p in $PACKAGES ; do
     addit="t"
@@ -1212,28 +1953,89 @@
 echo "  applying ENABLE settings"
 echo "" > ./.tmp_pack
 PACKAGES="$PACKAGES $ENABLE"
+# Test if each explicitly referenced package exists
 for i in $PACKAGES ; do
-    if test ! -d "$ROOTDIR/pkg/$i" ; then
+    j=`echo $i | sed 's/[-+]//'`
+    if test ! -d "$ROOTDIR/pkg/$j" ; then
 	echo "Error: can't find package $i at \"$ROOTDIR/pkg/$i\""
-	exit 1
+ 	exit 1
     fi
     echo $i >> ./.tmp_pack
 done
-pack=`cat ./.tmp_pack | sort | uniq`
-rm -f ./.tmp_pack
 PACKAGES=
-for i in $pack ; do
+for i in `grep -v "-" ./.tmp_pack | sort | uniq` ; do
     PACKAGES="$PACKAGES $i"
 done
+rm -f ./.tmp_pack
 echo "    packages are:  $PACKAGES"
 
+#  Check for package MNC: if NetCDF is available, then build the MNC 
+#  template files ; otherwise, delete mnc from the list of packages.
+echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    if test "x$HAVE_NETCDF" != xt ; then
+	cat <<EOF
+
+*********************************************************************
+WARNING: the "mnc" package was enabled but tests failed to compile
+  NetCDF applications.  Please check that:
+
+  1) NetCDF is correctly installed for this compiler and
+  2) the LIBS variable (within the "optfile") specifies the correct 
+       NetCDF library to link against.
+
+  Due to this failure, the "mnc" package is now DISABLED.
+*********************************************************************
+
+EOF
+	PACKAGES=`echo $PACKAGES | sed -e 's/mnc//g'`
+	DISABLE="$DISABLE mnc"
+    else
+	( cd $ROOTDIR"/pkg/mnc" && $MAKE testclean && $MAKE templates ) > make_mnc.errors 2>&1
+	RETVAL=$?
+	if test "x${RETVAL}" = x0 ; then
+	    rm -f make_mnc.errors
+	else
+	    echo "Error: problem encountered while building source files in pkg/mnc:"
+	    cat make_mnc.errors 1>&2
+	    exit 1
+	fi
+    fi
+fi
+
+#  Check for package PROFILES: if NetCDF is not available,
+#  then delete profiles from the list of available packages.
+echo $PACKAGES | grep ' profiles ' > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    if test "x$HAVE_NETCDF" != xt ; then
+	cat <<EOF
+
+*********************************************************************
+WARNING: the "profiles" package was enabled but tests failed to
+  compile NetCDF applications.  Please check that:
+
+  1) NetCDF is correctly installed for this compiler and
+  2) the LIBS variable (within the "optfile") specifies the correct 
+       NetCDF library to link against.
+
+  Due to this failure, the "profiles" package is now DISABLED.
+*********************************************************************
+
+EOF
+	PACKAGES=`echo $PACKAGES | sed -e 's/profiles//g'`
+	DISABLE="$DISABLE profiles"
+    fi
+fi
+
 echo "  applying package dependency rules"
 ck=
 while test "x$ck" != xtt ; do
     i=0
     # rtot=${#PNAME[@]}
     rtot=$nname
-    while test $i -lt $rtot ; do
+    while test $i -le $rtot ; do
 
 	#  Is $pname in the current $PACKAGES list?
 	#  pname=${PNAME[$i]}
@@ -1267,6 +2069,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
 	    in_dis="f"
 	    for dis in $DISABLE ; do
 		if test "x$dis" = "x$dname" ; then
@@ -1291,7 +2094,8 @@
 	    echo "  the dependency rules for \"$dname\""
 	    exit 1
 	fi
-	i=$(( $i + 1 ))
+        i=`echo "$i + 1" | bc -l`
+	#i=$(( $i + 1 ))
     done
     ck=$ck"t"
 done
@@ -1310,33 +2114,6 @@
     fi
 done
 
-#  Build MNC templates and check for ability to build and use NetCDF
-echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
-RETVAL=$?
-if test "x$RETVAL" = x0 ; then
-    ( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1
-    RETVAL=$?
-    if test "x${RETVAL}" = x0 ; then
-	rm -f make_mnc.errors
-    else
-	echo "Error: problem encountered while building source files in pkg/mnc:"
-	cat make_mnc.errors 1>&2
-	exit 1
-    fi
-    if test "x$HAVE_NETCDF" != xt ; then
-	cat <<EOF
-
-WARNING: the "mnc" package has been enabled but tests failed to 
-  compile and/or execute NetCDF applications.  Please check that:
-
-  1) NetCDF is installed for your compiler and
-  2) the LIBS variable (within the 'optfile") specifies the correct 
-       NetCDF library to link against.
-  
-EOF
-    fi
-fi
-
 # Create a list of #define and #undef to enable/disable packages
 PACKAGES_DOT_H=PACKAGES_CONFIG.h
 #  The following UGLY HACK sets multiple "#undef"s and it needs to go 
@@ -1356,14 +2133,14 @@
 	    fi
 	done
 	if test "x$has_pack" = xf ; then
-	    undef=`echo "ALLOW_$n" | $AWK '{print toupper($0)}'`
+	    undef=`echo "ALLOW_$n" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
             DISABLED_PACKAGES="$DISABLED_PACKAGES -U$undef"
 	fi
     fi
 done
 ENABLED_PACKAGES=
 for i in $PACKAGES ; do
-    def=`echo "ALLOW_$i" | $AWK '{print toupper($0)}'`
+    def=`echo "ALLOW_$i" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
     ENABLED_PACKAGES="$ENABLED_PACKAGES -D$def"
 #eh3 DEFINES="$DEFINES -D$def"
 
@@ -1447,22 +2224,66 @@
 	cat $i/$j >> ad_files
     done
 done
-
+if test ! "x"$FS = "x.f" ; then
+    cat ad_files | sed -e "s/\.f/.$FS/g" > ad_files_f
+    mv -f ad_files_f ad_files
+fi
 
 echo
 echo "===  Creating the Makefile  ==="
 echo "  setting INCLUDES"
 for i in $INCLUDEDIRS ; do
-    if ! test -d $i ; then
-#	INCLUDES="$INCLUDES -I$i"
-#   else
+    if test ! -d $i ; then
 	echo "Warning: can't find INCLUDEDIRS=\"$i\""
     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
+    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
+    echo
+    echo "ERROR : something is wrong with your directory permissions or"
+    echo "   your user file-creation mask (\"umask\") since creating a"
+    echo "   sub-dir, touch-ing a file within it, and then reading it is"
+    echo "   not working.  Please try setting your umask to something"
+    echo "   sane such as:"
+    echo
+    echo "      umask 0002"
+    echo
+    echo "   and please verify that you have the proper permissions for"
+    echo "   creating sub-directories and then reading files created"
+    echo "   within them."
+    echo
+    exit 1
+fi
+rm -f .links.tmp/foo
 echo "# This section creates symbolic links" > srclinks.tmp
 echo "" >> srclinks.tmp
 printf 'SRCFILES = '    > srclist.inc
@@ -1478,41 +2299,59 @@
     for sf in $sfiles ; do
 	if test ! -r ".links.tmp/$sf" ; then
 	    if test -f "$d/$sf" ; then
+		ignore_f=f
                 case $d/$sf in
                   ./$PACKAGES_DOT_H)
+			ignore_f=t
 			;;
                   ./AD_CONFIG.h)
+			ignore_f=t
 			;;
                   ./FC_NAMEMANGLE.h)
+			ignore_f=t
 			;;
-                  *)
-		  	touch .links.tmp/$sf
-		  	deplist="$deplist $sf"
+                  ./BUILD_INFO.h)
+			ignore_f=t
 			;;
-                esac
-		extn=`echo $sf | $AWK -F '.' '{print $NF}'`
-		case $extn in
-		    F)
-			echo    " \\"  >> srclist.inc
-			printf " $sf" >> srclist.inc
+                  ./EMBEDDED_FILES.h)
+			ignore_f=t
 			;;
-		    F90)
-			echo    " \\"  >> f90srclist.inc
-			printf " $sf" >> f90srclist.inc
-			;;
-		    c)
-			echo    " \\"  >> csrclist.inc
-			printf " $sf" >> csrclist.inc
-			;;
-		    h)
-			echo    " \\"  >> hlist.inc
-			printf " $sf" >> hlist.inc
-			;;
-		    flow)
-			echo    " \\"  >> ad_flow_files.inc
-			printf " $sf" >> ad_flow_files.inc
+                  *)
+			#  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
+			    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    " \\"  >> srclist.inc
+			    printf " $sf" >> srclist.inc
+			    ;;
+			F90)
+			    echo    " \\"  >> f90srclist.inc
+			    printf " $sf" >> f90srclist.inc
+			    ;;
+			c)
+			    echo    " \\"  >> csrclist.inc
+			    printf " $sf" >> csrclist.inc
+			    ;;
+			h)
+			    echo    " \\"  >> hlist.inc
+			    printf " $sf" >> hlist.inc
+			    ;;
+			flow)
+			    echo    " \\"  >> ad_flow_files.inc
+			    printf " $sf" >> ad_flow_files.inc
+			    ;;
+		    esac
+		fi
 	    fi
 	fi
     done
@@ -1530,7 +2369,7 @@
 echo "" >> hlist.inc
 echo "" >> ad_flow_files.inc
 
-if test -e $MAKEFILE ; then
+if test -f $MAKEFILE ; then
     mv -f $MAKEFILE "$MAKEFILE.bak"
 fi
 echo "  Writing makefile: $MAKEFILE"
@@ -1541,7 +2380,7 @@
 echo "# by the command:" >> $MAKEFILE
 echo "#    $0 $G2ARGS" >> $MAKEFILE
 echo "# executed by:" >> $MAKEFILE
-echo "#    $USER@${THISHOSTNAME}:${THISCWD}" >> $MAKEFILE
+echo "#    ${THISUSER}@${THISHOST}:${THISCWD}" >> $MAKEFILE
 
 EXE_AD=$EXECUTABLE"_ad"
 EXE_FTL=$EXECUTABLE"_ftl"
@@ -1587,12 +2426,16 @@
 DISABLED_PACKAGES = ${DISABLED_PACKAGES}
 
 # These files are created by Makefile
-SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h
-
+SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h BUILD_INFO.h
 EOF
 
-#  Note: figure out some way to add Hyades JAM libraries here
- 
+if test "x$EMBED_SRC" = xt ; then
+    echo "EMBEDDED_FILES = EMBEDDED_FILES.h" >>$MAKEFILE
+else
+    echo "EMBEDDED_FILES = " >>$MAKEFILE
+fi
+
+#  Note: figure out some way to add Hyades JAM libraries here 
 cat >>$MAKEFILE <<EOF
 # Unix ln (link)
 LN = ${LN}
@@ -1606,6 +2449,8 @@
 FC = ${FC}
 # Fortran compiler
 F90C = ${F90C}
+# C compiler
+CC = ${CC}
 # Link editor
 LINK = ${LINK} ${LDADD}
 
@@ -1617,7 +2462,7 @@
 KFLAGS1 = ${KFLAGS1}
 KFLAGS2 = ${KFLAGS2}
 # Optim./debug for FC
-FFLAGS = ${FFLAGS}
+FFLAGS = ${FFLAGS} ${FEXTRAFLAGS}
 FOPTIM = ${FOPTIM}
 # Optim./debug for FC
 F90FLAGS = ${F90FLAGS}
@@ -1628,7 +2473,7 @@
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
 # Flags and libraries needed for linking
-LIBS = ${LIBS} \$(XLIBS)
+LIBS = ${LIBS}
 # Name of the Mekfile
 MAKEFILE=${MAKEFILE}
 
@@ -1639,29 +2484,34 @@
 cat f90srclist.inc    >> $MAKEFILE
 cat hlist.inc         >> $MAKEFILE
 cat ad_flow_files.inc >> $MAKEFILE
-echo               >> $MAKEFILE
-echo 'F77FILES =  $(SRCFILES:.F=.f)'                                           >> $MAKEFILE
-echo 'F90FILES =  $(F90SRCFILES:.F90=.f90)'                                    >> $MAKEFILE
+echo >> $MAKEFILE
+echo 'F77FILES =  $(SRCFILES:.F=.'$FS')'      >> $MAKEFILE
+echo 'F90FILES =  $(F90SRCFILES:.F90=.'$FS90')' >> $MAKEFILE
 echo 'OBJFILES =  $(SRCFILES:.F=.o) $(CSRCFILES:.c=.o) $(F90SRCFILES:.F90=.o)' >> $MAKEFILE
-
+echo >> $MAKEFILE
+echo '.SUFFIXES:' >> $MAKEFILE
+echo '.SUFFIXES: .o .'$FS' .p .F .c .'$FS90' .F90' >> $MAKEFILE
 rm -f srclist.inc csrclist.inc hlist.inc flist.tmp clist.tmp f90srclist.inc
 rm -f ad_flow_files.inc
 
 cat >>$MAKEFILE <<EOF
 
-.SUFFIXES:
-.SUFFIXES: .o .f .p .F .c .F90 .f90
-
 all: \$(EXECUTABLE)
-\$(EXECUTABLE): \$(SPECIAL_FILES) \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(OBJFILES)
+\$(EXECUTABLE): \$(SPECIAL_FILES) \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(OBJFILES) \$(EMBEDDED_FILES)
 	@echo Creating \$@ ...
 	\$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) \$(LIBS)
 depend:
 	@make links
-	\$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
+	\$(MAKEDEPEND) -o .$FS \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
 	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 	-rm -f makedepend.out
 
+lib: libmitgcmuv.a
+
+libmitgcmuv.a: \$(OBJFILES)
+	ar rcv libmitgcmuv.a \$(OBJFILES)
+	ar d   libmitgcmuv.a main.o
+
 links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
 
 small_f: \$(F77FILES) \$(F90FILES)
@@ -1671,7 +2521,9 @@
 	@\$(EXECUTABLE) > \$@
 
 clean:
-	-rm -rf *.o *.f *.p *.f90 *.mod ${RMFILES} work.{pc,pcl} *.template
+	-rm -rf *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template
+	-rm -rf *.o
+	-rm -rf *.$FS
 Clean:
 	@make clean
 	@make cleanlinks
@@ -1682,7 +2534,8 @@
 	-find \$(EXEDIR) -name "*.meta" -exec rm {} \;
 	-find \$(EXEDIR) -name "*.data" -exec rm {} \;
 	-find \$(EXEDIR) -name "fort.*" -exec rm {} \;
-	-rm -f \$(EXECUTABLE) output.txt
+	-rm -f \$(EXECUTABLE) \$(EXE_AD) *.txt STD* *diagnostics.log datetime
+	-rm -rf mnc_test_*
 
 #eh3 Makefile: makefile
 makefile:
@@ -1690,7 +2543,7 @@
 cleanlinks:
 	-find . -type l -exec rm {} \;
 
-# Special targets ($SPECIAL_FILES) which are create by make
+# Special targets (SPECIAL_FILES) which are create 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) > \$@
@@ -1701,22 +2554,54 @@
 	@echo Creating \$@ ...
 	echo "$FC_NAMEMANGLE" > \$@
 
-# The normal chain of rules is (  .F - .f - .o  )
-.F.f:
+BUILD_INFO.h:
+	@echo Creating \$@ ...
+EOF
+
+test ! "x$THISVER" = x  && echo "	-echo \"#define THISVER '$THISVER'\" > \$@"   >> $MAKEFILE
+test ! "x$THISUSER" = x && echo "	-echo \"#define THISUSER '$THISUSER'\" >> \$@" >> $MAKEFILE
+test ! "x$THISDATE" = x && echo "	-echo \"#define THISDATE '$THISDATE'\" >> \$@" >> $MAKEFILE
+test ! "x$THISHOST" = x && echo "	-echo \"#define THISHOST '$THISHOST'\" >> \$@" >> $MAKEFILE
+
+if test "x$EMBED_SRC" = xt ; then
+    cat >>$MAKEFILE <<EOF
+
+decode_files.o : EMBEDDED_FILES.h
+
+##  \$(F77FILES) 
+all_fF.tar.gz : \$(SPECIAL_FILES) \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(F77FILES) Makefile
+	@echo Creating \$@ ...
+	-tar -hcf all_fF.tar \$(SPECIAL_FILES) \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(F77FILES) Makefile
+	-rm -f all_fF.tar.gz
+	-gzip all_fF.tar
+
+EMBEDDED_FILES.h : all_fF.tar.gz
+	@echo Creating \$@ ...
+	-\${ROOTDIR}/tools/embed_encode/encode_files EMBEDDED_FILES.h all_fF.tar.gz
+
+EOF
+fi
+
+cat >>$MAKEFILE <<EOF
+
+# The normal chain of rules is (  .F - .$FS - .o  )
+
+## This nullifies any default implicit rules concerning these two file types:
+## %.o : %.F
+
+.F.$FS:
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
-.f.o:
+.$FS.o:
 	\$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
-.F90.f90:
-	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
-.f90.o:
+.F90.o:   
 	\$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
 .c.o:
-	\$(CC) \$(CFLAGS) -c \$<
+	\$(CC) \$(CFLAGS) \$(DEFINES) \$(INCLUDES) -c \$<
 
-# Special exceptions that use the ( .F - .p - .f - .o ) rule-chain
+# Special exceptions that use the ( .F - .p - .$FS - .o ) rule-chain
 .F.p:
 	\$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
-.p.f:
+.p.$FS:
 	\$(KPP) \$(KFLAGS1)\$@ \$(KFLAGS2) \$<
 
 #=========================================
@@ -1735,10 +2620,10 @@
 ad_vars="$ad_vars SVD_TAMC_FLAGS SVD_TAF_FLAGS"
 for i in $ad_vars ; do
     name=$i
-    t1="t2=\$"`echo $i`
+    t1="t2=\$"`echo "$i"`
     eval $t1
     printf "%-20s = " $name >> $MAKEFILE
-    echo $t2 >> $MAKEFILE
+    echo "$t2" | sed -e 's| \+| |g' >> $MAKEFILE
 done
 
 echo "  Add the source list for AD code generation"
@@ -1755,76 +2640,97 @@
 cat >>$MAKEFILE <<EOF
 
 # ... AD ...
-adall: ad_taf
-adtaf: ad_taf_output.f
-adtamc: ad_tamc_output.f
+adall: \$(EXE_AD)
+adtaf: ad_taf_output.$FS
+adtamc: ad_tamc_output.$FS
 
-ad_input_code.f: \$(AD_FILES) \$(HEADERFILES)
+ad_input_code.$FS: \$(AD_FILES) \$(HEADERFILES)
 	@$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
 	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
 	-rm -f ad_config.template
 	@make \$(F77FILES)
 	@make \$(AD_FLOW_FILES)
-	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ad_input_code.f
+	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ad_input_code.$FS
 
-ad_taf_output.f: ad_input_code.f
-	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f
-	cat ad_input_code_ad.f | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.f
+ad_taf_output.$FS: ad_input_code.$FS
+	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
+	cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
 
 adtafonly:
-	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f
-	cat ad_input_code_ad.f | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.f
+	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
+	cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
 
-ad_taf: ad_taf_output.o \$(OBJFILES)
-	\$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS) 
+\${EXE_AD}: ad_taf_output.o \$(OBJFILES)
+	\$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS) 
 
-ad_tamc_output.f: ad_input_code.f
-	\$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.f
-	cat ad_input_code_ad.f | sed -f \$(TOOLSDIR)/adjoint_sed > ad_tamc_output.f
+ad_tamc_output.$FS: ad_input_code.$FS
+	\$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
+	cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_tamc_output.$FS
 
 ad_tamc: ad_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_tamc_output.o \$(LIBS) 
 
+adonlyfwd:
+	patch < \$(TOOLSDIR)/ad_taf_output.f.onlyfwd.diff
+ 
+adtrick:
+	patch < \$(TOOLSDIR)/ad_taf_output.f.adtrick.diff
 
 # ... FTL ...
 ftlall: ftl_taf
-ftltaf: ftl_taf_output.f
-ftltamc: ftl_tamc_output.f
+ftltaf: ftl_taf_output.$FS
+ftltamc: ftl_tamc_output.$FS
 
-ftl_input_code.f: \$(AD_FILES) \$(HEADERFILES)
+ftl_input_code.$FS: \$(AD_FILES) \$(HEADERFILES)
 	@$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 \$(F77FILES)
 	@make \$(AD_FLOW_FILES)
-	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.f
+	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.$FS
 
-ftl_taf_output.f: ftl_input_code.f
-	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.f
-	cat ftl_input_code_ftl.f | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.f
+ftl_taf_output.$FS: ftl_input_code.$FS
+	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
+	cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
 
 ftltafonly:
-	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.f
-	cat ftl_input_code_ftl.f | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.f
+	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
+	cat ftl_input_code_ftl.$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) 
 
-ftl_tamc_output.f: ftl_input_code.f
-	\$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.f
-	cat ftl_input_code_ftl.f | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_tamc_output.f
+ftl_tamc_output.$FS: ftl_input_code.$FS
+	\$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
+	cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_tamc_output.$FS
 
 ftl_tamc: ftl_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_tamc_output.o \$(LIBS) 
 
 
 # ... SVD ...
-svdtaf: ad_taf_output.f ftl_taf_output.f
-svdall: svd_taf
+svdtaf: ad_taf_output.$FS ftl_taf_output.$FS
+	@echo "--->>> Only ran TAF to generate SVD code!    <<<---"
+	@echo "--->>> Do make svdall afterwards to compile. <<<---"
+svdall: svd_touch svd_taf
 
-svd_taf: ad_taf_output.o ftl_taf_output.o \$(OBJFILES)
+svd_taf: \$(OBJFILES)
 	\$(LINK) -o mitgcmuv_svd \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o ftl_taf_output.o \$(LIBS)
 
+	@echo "--->>> Only COMPILE svd code! <<<---"
+	@echo "--->>> Assumes you previously <<<---"
+	@echo "--->>> did make svdtaf        <<<---"
+
+svd_touch:
+	@echo "--->>> Only COMPILE svd code! <<<---"
+	@echo "--->>> Assumes you previously <<<---"
+	@echo "--->>> did make svdtaf        <<<---"
+	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
 
 #=========================================
 
@@ -1841,7 +2747,7 @@
     if test "x$RETVAL" != x0 ; then
 	echo "Error: unable to add file \"$i\" to the exceptions list"
     fi
-    echo "$base.f: $base.p" >> $MAKEFILE
+    echo "$base.$FS: $base.p" >> $MAKEFILE
 done
 
 echo "  Making list of NOOPTFILES"
@@ -1851,7 +2757,7 @@
     if test "x$RETVAL" != x0 ; then
 	echo "Error: unable to add file \"$i\" to the exceptions list"
     fi
-    echo "$base.o: $base.f" >> $MAKEFILE
+    echo "$base.o: $base.$FS" >> $MAKEFILE
     printf "\t\$(FC) \$(FFLAGS) \$(NOOPTFLAGS) -c \$<\n" >> $MAKEFILE
 done