--- MITgcm/tools/genmake2 2005/03/22 19:45:03 1.121 +++ MITgcm/tools/genmake2 2005/06/07 20:52:42 1.124 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.121 2005/03/22 19:45:03 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.124 2005/06/07 20:52:42 edhill Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -321,7 +321,7 @@ #================================================================ # look for possible FORTRAN compilers - tmp="$MITGCM_FC $FC efc 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 gfortran" p_FC= for c in $tmp ; do rm -f ./hello.f ./hello @@ -835,7 +835,7 @@ MPI= MPIPATH= -# DEFINES checked by test compilation +# DEFINES checked by test compilation or command-line HAVE_SYSTEM= HAVE_FDATE= FC_NAMEMANGLE= @@ -843,6 +843,7 @@ HAVE_STAT= HAVE_NETCDF= HAVE_ETIME= +IGNORE_TIME= MODS= TOOLSDIR= @@ -1091,6 +1092,9 @@ ac_prev=TAMC_EXTRA ;; -tamc_extra=* | --tamc_extra=*) TAMC_EXTRA=$ac_optarg ;; + + -ignoretime | -ignore_time | --ignoretime | --ignore_time) + IGNORE_TIME="-DIGNORE_TIME" ;; -*) echo "Error: unrecognized option: "$ac_option @@ -1387,7 +1391,7 @@ else echo "no" fi - +DEFINES="$DEFINES $IGNORE_TIME" printf "\n=== Setting defaults ===\n" printf " Adding MODS directories: " @@ -1827,7 +1831,7 @@ done done if test ! "x"$FS = "x.f" ; then - cat ad_files | sed -e "s/\.f/$FS/g" > ad_files_f + cat ad_files | sed -e "s/\.f/.$FS/g" > ad_files_f mv -f ad_files_f ad_files fi