--- MITgcm/tools/genmake2	2005/01/06 15:32:16	1.116
+++ 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.116 2005/01/06 15:32:16 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 <<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 $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 <<EOF > genmake_tc_2.f
+    cat <<EOF > 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 <<EOF > genmake_tc_2.f
+    cat <<EOF > 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=$?
@@ -722,14 +722,14 @@
 	return
     fi
     echo "" > genmake_tnc.log
-    cat <<EOF > genmake_tnc.for
+    cat <<EOF > genmake_tnc.F
       program fgennc
 #include "netcdf.inc"
 EOF
     if test ! "x$MPI" = x ; then
-	echo '#include "mpif.h"' >> genmake_tnc.for
+	echo '#include "mpif.h"' >> genmake_tnc.F
     fi
-    cat <<EOF >> genmake_tnc.for
+    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)
@@ -740,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." \
@@ -752,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=$?
 
@@ -769,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
@@ -1286,12 +1286,12 @@
 
 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 $DEFINES -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
 RETVAL=$?
 if test "x$RETVAL" = x0 ; then
     HAVE_SYSTEM=t
@@ -1304,7 +1304,7 @@
 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
       string = ' '
@@ -1312,7 +1312,7 @@
       print *, string
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.f > 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
@@ -1325,7 +1325,7 @@
 rm -f genmake_tcomp*
 
 printf "  Do we have the etime() command using $FC...  "
-cat > genmake_tcomp.f <<EOF
+cat > genmake_tcomp.$FS <<EOF
       program hello
       REAL*4 ACTUAL, TARRAY(2)
       EXTERNAL ETIME
@@ -1334,7 +1334,7 @@
       print *, tarray
       end
 EOF
-$FC $FFLAGS $DEFINES -o genmake_tcomp genmake_tcomp.f > 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