--- MITgcm/tools/genmake2 2004/11/13 03:23:28 1.111 +++ MITgcm/tools/genmake2 2005/02/09 17:34:19 1.118 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.111 2004/11/13 03:23:28 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.118 2005/02/09 17:34:19 edhill Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -581,13 +581,13 @@ EOF return 1 fi - cat > genmake_tcomp.f < genmake_tcomp.$FS <> genmake_warnings 2>&1 + $FC $FFLAGS $DEFINES -c genmake_tcomp.$FS >> genmake_warnings 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm @@ -653,9 +653,9 @@ *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 < genmake_tc_2.f + cat < genmake_tc_2.$FS program hello Real*8 wtime external cloc @@ -663,9 +663,9 @@ print *," HELLO WORLD", wtime end program hello EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.f genmake_tc_1.o >> genmake_tc.log 2>&1 + $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> 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 @@ -698,14 +698,14 @@ EOF make genmake_tc_1.o >> genmake_tc.log 2>&1 RET_C=$? - cat < genmake_tc_2.f + cat < genmake_tc_2.$FS program hello integer nbyte call tfsize(nbyte) print *," HELLO WORLD", nbyte end program hello EOF - $FC $FFLAGS -o genmake_tc genmake_tc_2.f genmake_tc_1.o >> genmake_tc.log 2>&1 + $FC $FFLAGS -o genmake_tc genmake_tc_2.$FS genmake_tc_1.o >> genmake_tc.log 2>&1 RET_F=$? test -x ./genmake_tc && ./genmake_tc >> genmake_tc.log 2>&1 RETVAL=$? @@ -718,10 +718,18 @@ check_netcdf_libs() { + if test ! "x$SKIP_NETCDF_CHECK" = x ; then + return + fi echo "" > genmake_tnc.log - cat < genmake_tnc.for + cat < genmake_tnc.F program fgennc #include "netcdf.inc" +EOF + if test ! "x$MPI" = x ; then + echo '#include "mpif.h"' >> genmake_tnc.F + fi + cat <> 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) @@ -732,10 +740,10 @@ end EOF echo "Executing:" > genmake_tnc.log - echo " $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f" \ + echo " $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS" \ > genmake_tnc.log RET_CPP=f - $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null \ + $CPP $DEFINES $INCLUDES genmake_tnc.F > 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." \ @@ -744,9 +752,9 @@ > genmake_tnc.log fi echo "Executing:" > genmake_tnc.log - echo " $FC $FFLAGS $FOPTIM -c genmake_tnc.f" > genmake_tnc.log + echo " $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS" > genmake_tnc.log echo " $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log - $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1 \ + $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ && $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1 RET_COMPILE=$? @@ -761,8 +769,8 @@ HAVE_NETCDF=t else # try again with "-lnetcdf" added to the libs - $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null \ - && $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1 \ + $CPP $DEFINES $INCLUDES genmake_tnc.F > genmake_tnc.$FS 2>/dev/null \ + && $FC $FFLAGS $FOPTIM -c genmake_tnc.$FS >> genmake_tnc.log 2>&1 \ && $LINK -o genmake_tnc genmake_tnc.o $LIBS -lnetcdf >> genmake_tnc.log 2>&1 RET_COMPILE=$? if test "x$RET_COMPILE" = x0 ; then @@ -788,9 +796,9 @@ LN= S64= KPP= -FC= +#FC= #CC=gcc -CPP= +#CPP= LINK= DEFINES= PACKAGES= @@ -834,8 +842,8 @@ G2ARGS= BASH= PWD=`pwd` -MAKE=make -AWK=awk +test "x$MAKE" = x && MAKE=make +test "x$AWK" = x && AWK=awk THISHOST=`hostname` THISCWD=`pwd` THISDATE=`date` @@ -1101,7 +1109,7 @@ # Find the MITgcm ${ROOTDIR} if test "x${ROOTDIR}" = x ; then - tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'` + tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'` if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then ROOTDIR=".." else @@ -1278,12 +1286,12 @@ printf "\n=== Checking system libraries ===\n" printf " Do we have the system() command using $FC... " -cat > genmake_tcomp.f < genmake_tcomp.$FS < genmake_tcomp.log 2>&1 +$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_SYSTEM=t @@ -1296,7 +1304,7 @@ rm -f genmake_tcomp* printf " Do we have the fdate() command using $FC... " -cat > genmake_tcomp.f < genmake_tcomp.$FS < genmake_tcomp.log 2>&1 +$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_FDATE=t @@ -1317,7 +1325,7 @@ rm -f genmake_tcomp* printf " Do we have the etime() command using $FC... " -cat > genmake_tcomp.f < genmake_tcomp.$FS < genmake_tcomp.log 2>&1 +$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1 RETVAL=$? if test "x$RETVAL" = x0 ; then HAVE_ETIME=t @@ -1388,7 +1396,7 @@ fi if test "x${EXEDIR}" = x ; then - tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'` + tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'` if test "x$tmp" = "xbin" -a -d ../exe -a $ROOTDIR = .. ; then EXEDIR=../exe else @@ -1714,14 +1722,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" @@ -1848,7 +1856,7 @@ deplist="$deplist $sf" ;; esac - extn=`echo $sf | $AWK -F '.' '{print $NF}'` + extn=`echo $sf | $AWK -F. '{print $NF}'` case $extn in F) echo " \\" >> srclist.inc