--- MITgcm/tools/genmake2	2003/10/22 18:00:49	1.21
+++ MITgcm/tools/genmake2	2003/11/11 20:38:27	1.29
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.21 2003/10/22 18:00:49 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.29 2003/11/11 20:38:27 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -72,7 +72,8 @@
 
     tmp1=`uname`"_"`uname -m`
     tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    PLATFORM=`echo $tmp2 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`
+    tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'`
+    PLATFORM=`echo $tmp3 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`
     OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
     echo "  The platform appears to be:  $PLATFORM"
 #     if test "x$OFLIST" = x ; then
@@ -104,7 +105,7 @@
     fi
 
     # look for possible fortran compilers
-    tmp="$MITGCM_FC $FC g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95"
+    tmp="$MITGCM_FC $FC efc g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95"
     p_FC=
     for c in $tmp ; do
 	rm -f ./hello.f ./hello
@@ -312,6 +313,11 @@
 NOOPTFILES=
 NOOPTFLAGS=
 
+# DEFINES checked by test compilation
+HAVE_SYSTEM=
+HAVE_FDATE=
+FC_NAMEMANGLE=
+
 MODS=
 TOOLSDIR=
 SOURCEDIRS=
@@ -357,13 +363,15 @@
 gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS"
 gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOSTNAME THISDATE MACHINE"
 gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
+gm_s7="HAVE_SYSTEM HAVE_FDATE FC_NAMEMANGLE"
 
 #  The following are all related to adjoint/tangent-linear stuff
-gm_s7="AUTODIFF_PKG_USED AD_OPTFILE TAMC TAF AD_TAMC_FLAGS AD_TAF_FLAGS"
-gm_s8="FTL_TAMC_FLAGS FTL_TAF_FLAGS SVD_TAMC_FLAGS SVD_TAF_FLAGS"
-gm_s9="TAF_EXTRA TAMC_EXTRA"
+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_state="COMMANDL $gm_s1 $gm_s2 $gm_s3 $gm_s4 $gm_s5 $gm_s6 $gm_s7 $gm_s8 $gm_s9"
+gm_state="COMMANDL $gm_s1 $gm_s2 $gm_s3 $gm_s4 $gm_s5 $gm_s6 $gm_s7"
+gm_state="$gm_state $gm_s10 $gm_s11 $gm_s12"
 
 
 echo
@@ -662,6 +670,89 @@
     MAKEDEPEND=makedepend
 fi
 
+
+printf "\n===  Checking system libraries  ===\n"
+echo -n "  Do we have the system() command using $FC...  "
+cat > genmake_tcomp.f <<EOF
+      program hello
+      call system('echo hi')
+      end
+EOF
+$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.f > genmake_tcomp.log 2>&1
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    HAVE_SYSTEM=t
+    DEFINES="$DEFINES -DHAVE_SYSTEM"
+    echo "yes"
+else
+    HAVE_SYSTEM=
+    echo "no"
+fi
+rm -f genmake_tcomp*
+
+echo -n "  Do we have the fdate() command using $FC...  "
+cat > genmake_tcomp.f <<EOF
+      program hello
+      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
+RETVAL=$?
+if test "x$RETVAL" = x0 ; then
+    HAVE_FDATE=t
+    DEFINES="$DEFINES -DHAVE_FDATE"
+    echo "yes"
+else
+    HAVE_FDATE=
+    echo "no"
+fi
+rm -f genmake_tcomp*
+
+echo -n "  The name mangling convention for $FC is...  "
+if test "x$FC_NAMEMANGLE" = x ; then
+    FC_NAMEMANGLE="#define FC_NAMEMANGLE(X) X ## _" 
+fi
+cat > genmake_tcomp.f <<EOF
+      subroutine tcall( string )
+      character*(*) string
+      call tsub( string )
+      end
+EOF
+$FC $FFLAGS $DEFINES -c genmake_tcomp.f > genmake_tcomp.log 2>&1
+RETVAL=$?
+if test "x$RETVAL" != x0 ; then
+    cat genmake_tcomp.log >> genmake_errors
+    echo
+    echo "WARNING: test compile fails -- please see \"genmake_errors\""
+    echo "WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE'"
+    echo "WARNING: Please contact <MITgcm-support@mitgcm.org> if you need help here."
+else
+    tcall=`nm genmake_tcomp.o | grep tcall | cut -d ' ' -f 3`
+    RETVAL=$?
+    if test "x$RETVAL" != x0 ; then
+	echo
+	echo "WARNING: The \"nm\" command failed."
+	echo "WARNING: We'll try to use: FC_NAMEMANGLE='$FC_NAMEMANGLE'"
+	echo "WARNING: Please contact <MITgcm-support@mitgcm.org> if you need help here."
+    else
+	t0=`echo $tcall | sed -e 's|_tcall|_ ## X|g'`
+	nmres=`echo $t0 | sed -e 's|tcall_|X ## _|g'`
+	FC_NAMEMANGLE="#define FC_NAMEMANGLE(X)  $nmres"
+	echo "'$FC_NAMEMANGLE'"
+    fi
+fi
+echo "$FC_NAMEMANGLE" > FC_NAMEMANGLE.h.template
+cmp FC_NAMEMANGLE.h FC_NAMEMANGLE.h.template > /dev/null 2>&1
+RETVAL=$?
+if test "x$RETVAL" != x0 ; then
+    mv -f FC_NAMEMANGLE.h.template FC_NAMEMANGLE.h
+fi
+rm -f genmake_tcomp*
+
+
 printf "\n===  Setting defaults  ===\n"
 echo -n "  Adding MODS directories:  "
 for d in $MODS ; do
@@ -909,24 +1000,6 @@
     fi
 done
 
-#  This is compatible with the old genmake.  The "DISABLE_*" flags
-#  need to be replaced by the "ALLOW_*" flags set below.
-#
-# echo -n "  Setting package-specific CPP flags:  "
-# pkrm=( mom_fluxform mom_vecinv generic_advdiff )
-# pkrmdef=( -DDISABLE_MOM_FLUXFORM -DDISABLE_MOM_VECINV -DDISABLE_GENERIC_ADVDIFF -DDISABLE_DEBUGMODE )
-# echo -n "  "
-# i=0
-# while test $i -lt "${#pkrm[@]}" ; do
-#     echo "$PACKAGES" | grep "${pk[$i]}" > /dev/null 2>&1
-#     RETVAL=$?
-#     if test "x$RETVAL" = x1 ; then
-# 	DEFINES="$DEFINES ${pkdef[$i]}"
-# 	echo -n " ${pkdef[$i]}"
-#     fi
-#     i=$(( $i + 1 ))
-# done
-# echo
 
 # Create a list of #define and #undef to enable/disable packages
 PACKAGES_DOT_H=PACKAGES_CONFIG.h
@@ -960,22 +1033,6 @@
 	if test "x$has_pack" = xf ; then
 	    undef=`echo "ALLOW_$n" | $AWK '{print toupper($0)}'`
 	    echo "#undef $undef" >> $PACKAGES_DOT_H".tmp"
-#           DEFINES="$DEFINES -U$undef"
-
-#EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
-	    case $n in 
-		mom_fluxform)
-		    DEFINES="$DEFINES -DDISABLE_MOM_FLUXFORM"
-		    ;;
-		mom_vecinv)
-		    DEFINES="$DEFINES -DDISABLE_MOM_VECINV"
-		    ;;
-		debug)
-		    DEFINES="$DEFINES -DDISABLE_DEBUGMODE"
-		    ;;
-	    esac
-#EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
-
 	fi
     fi
 done
@@ -1041,8 +1098,8 @@
     fi
 done
 
-echo " Searching for CPP_OPTIONS.h in order to warn about the presence"
-echo " of \"#define ALLOW_PKGNAME\"-type statements:"
+echo "  Searching for CPP_OPTIONS.h in order to warn about the presence"
+echo "    of \"#define ALLOW_PKGNAME\"-type statements:"
 CPP_OPTIONS=
 spaths=". $INCLUDEDIRS"
 for i in $spaths ; do
@@ -1292,11 +1349,12 @@
 	@\$(EXECUTABLE) > \$@
 
 clean:
+	-cat AD_CONFIG.template > AD_CONFIG.h
 	-rm -rf *.o *.f *.p *.f90 *.mod ${RMFILES} work.{pc,pcl}
 Clean:
 	@make clean
 	@make cleanlinks
-	-rm -f Makefile.bak genmake_state genmake_optfile make.log
+	-rm -f Makefile.bak genmake_state genmake_*optfile make.log
 CLEAN:
 	@make Clean
 	-find \$(EXEDIR) -name "*.meta" -exec rm {} \;
@@ -1363,15 +1421,17 @@
 
 cat >>$MAKEFILE <<EOF
 
-ad_input_code.f: \$(F77FILES)
+# ... AD ...
+adall: ad_taf
+adtaf: ad_taf_output.f
+adtamc: ad_tamc_output.f
+
+ad_input_code.f: \$(AD_FILES) \$(HEADERFILES)
+	cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+	@make \$(F77FILES)
 	@make \$(AD_FLOW_FILES)
 	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ad_input_code.f
 
-# ... AD ...
-ad: ad_taf
-ad_taf_f: ad_taf_output.f
-ad_tamc_f: ad_tamc_output.f
-
 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 adjoint_sed > ad_taf_output.f
@@ -1388,20 +1448,26 @@
 
 
 # ... FTL ...
-ftl: ftl_taf
-ftl_taf_f: ftl_taf_output.f
-ftl_tamc_f: ftl_tamc_output.f
-
-ftl_taf_output.f: ad_input_code.f
-	\$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f
-	cat ad_input_code_ftl.f | sed -f adjoint_sed > ftl_taf_output.f
+ftlall: ftl_taf
+ftltaf: ftl_taf_output.f
+ftltamc: ftl_tamc_output.f
+
+ftl_input_code.f: \$(AD_FILES) \$(HEADERFILES)
+	cmp ftl_config.template AD_CONFIG.h || cat ftl_config.template > AD_CONFIG.h
+	@make \$(F77FILES)
+	@make \$(AD_FLOW_FILES)
+	cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.f
+
+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 adjoint_sed > ftl_taf_output.f
 
 ftl_taf: ftl_taf_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS) 
 
-ftl_tamc_output.f: ad_input_code.f
-	\$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.f
-	cat ad_input_code_ftl.f | sed -f adjoint_sed > ftl_tamc_output.f
+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 adjoint_sed > ftl_tamc_output.f
 
 ftl_tamc: ftl_tamc_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_tamc_output.o \$(LIBS) 
@@ -1411,9 +1477,15 @@
 svd: svd_taf
 svd_taf_f: svd_taf_output.f
 
-svd_taf_output.f: ad_input_code.f
-	\$(TAF) \$(SVD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.f
-	cat ad_input_code_ad.f | sed -f adjoint_sed > svd_taf_output.f
+svd_input_code.f: \$(SRCFILES)
+	cmp svd_config.template AD_CONFIG.h || cat svd_config.template > AD_CONFIG.h
+	@make \$(F77FILES)
+	@make \$(AD_FLOW_FILES)
+	cat \$(AD_FLOW_FILES) \$(AD_FILES) > svd_input_code.f
+
+svd_taf_output.f: svd_input_code.f
+	\$(TAF) \$(SVD_TAF_FLAGS) \$(TAF_EXTRA) svd_input_code.f
+	cat svd_input_code_ad.f | sed -f adjoint_sed > svd_taf_output.f
 
 svd_taf: svd_taf_output.o \$(OBJFILES)
 	\$(LINK) -o ${EXE_SVD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) svd_taf_output.o \$(LIBS) 
@@ -1457,6 +1529,45 @@
 
 printf "\n===  Done  ===\n"
 
+#  Write the "template" files for the adjoint builds
+cat >AD_CONFIG.template <<EOF
+C  WARNING: This file is automatically generated by genmake2 and 
+C    used by the Makefile rules.  Please DO NOT EDIT this file 
+C    unless you are CERTAIN that you know what you are doing.
+
+#undef ALLOW_ADJOINT_RUN
+#undef ALLOW_TANGENTLINEAR_RUN
+#undef ALLOW_ECCO_OPTIMIZATION
+EOF
+cat >ad_config.template <<EOF
+C  WARNING: This file is automatically generated by genmake2 and 
+C    used by the Makefile rules.  Please DO NOT EDIT this file 
+C    unless you are CERTAIN that you know what you are doing.
+
+#define ALLOW_ADJOINT_RUN
+#undef ALLOW_TANGENTLINEAR_RUN
+#undef ALLOW_ECCO_OPTIMIZATION
+EOF
+cat >ftl_config.template <<EOF
+C  WARNING: This file is automatically generated by genmake2 and 
+C    used by the Makefile rules.  Please DO NOT EDIT this file 
+C    unless you are CERTAIN that you know what you are doing.
+
+#undef ALLOW_ADJOINT_RUN
+#define ALLOW_TANGENTLINEAR_RUN
+#undef ALLOW_ECCO_OPTIMIZATION
+EOF
+cat >svd_config.template <<EOF
+C  WARNING: This file is automatically generated by genmake2 and 
+C    used by the Makefile rules.  Please DO NOT EDIT this file 
+C    unless you are CERTAIN that you know what you are doing.
+
+#undef ALLOW_ADJOINT_RUN
+#undef ALLOW_TANGENTLINEAR_RUN
+#undef ALLOW_ECCO_OPTIMIZATION
+EOF
+cp AD_CONFIG.template AD_CONFIG.h
+
 
 #  Write the "state" for future records
 if test "x$DUMPSTATE" != xf ; then