--- MITgcm/tools/genmake	2000/03/14 16:21:41	1.12
+++ MITgcm/tools/genmake	2000/03/24 19:28:46	1.16
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.12 2000/03/14 16:21:41 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/Attic/genmake,v 1.16 2000/03/24 19:28:46 adcroft Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created by cnh 03/98
@@ -182,26 +182,40 @@
     breaksw
   case Linux+mpi:
     set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
+    set INCLUDES   = ( '-I/usr/local/include' )
   case Linux:
     set LN         = ( '/bin/ln -fs' )
-    set CPP        = ( '/usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/cpp  -traditional -P' )
+    set CPP        = ( '/lib/cpp  -traditional -P' )
     set DEFINES    = ( ${DEFINES} '-D_BYTESWAPIO -DWORDLENGTH=4' )
-    set INCLUDES   = ( '-I/usr/local/include' )
     set FC         = ( 'g77' )
-    set FFLAGS     = ( ' ' )
-    set FOPTIM     = ( '-O3 -funroll-loops ' )
+    set FFLAGS     = ( '-Wimplicit -Wunused -Wuninitialized' )
+    set FOPTIM     = ( '-O3 -malign-double -funroll-loops ' )
     set LINK       = ( 'g77' )
     breaksw
+  case Linux+pgi+mpi:
+    if ($?include_jam_libs) then
+     set INCLUDES   = ( '-I/usr/local//mpich-cnh-install/include' )
+     set LIBS       = ( '-L/usr/local/mpich-cnh-install/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
+    else
+     set INCLUDES   = ( '-I/usr/local/include' )
+     set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich' )
+    endif
   case Linux+pgi:
     set LN         = ( '/bin/ln -fs' )
-    set CPP        = ( '/usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3/cpp -P' )
+    set CPP        = ( '/lib/cpp -traditional -P' )
     set DEFINES    = ( ${DEFINES} '-DWORDLENGTH=4' )
-    set INCLUDES   = ( '-I/usr/local/include' )
     set FC         = ( 'pgf77' )
     set FFLAGS     = ( '-byteswapio' )
     set FOPTIM     = ( '-tp p6 -v -O2 -Munroll -Mvect=cachesize:512000,transform -Kieee' )
     set LINK       = ( 'pgf77' )
-    set LIBS       = ( '-L/usr/local/lib/LINUX/ch_p4/ -lfmpich -lmpich -Kieee' )
+    breaksw
+  case T3E:
+  case sn6312:
+    set CPP        = ( '/opt/ctl/bin/cpp -P')
+    set DEFINES    = ( ${DEFINES} '-DTARGET_T3E -DWORDLENGTH=4' )
+    set FC         = ( 'f90' )
+    set LINK       = ( 'f90' )
+    set FFLAGS     = ( '-O 2,fusion' )
     breaksw
   default:
     echo "Error: platform not recognized: uname -p = " $platform$USEMPI
@@ -303,6 +317,7 @@
 cat >> ${mfile} <<EOF
 # extra stuff for Hyades ............................................
 HYADES_DIR = /u/u0/cnh/jam-lib/software
+HYADES_DIR = /u/u0/cnh/jam-lib-twoproc
 WORK_DIR   = \$(HYADES_DIR)
 DEPOSIT_DIR = linux_bin
 
@@ -356,7 +371,7 @@
 NOOPTFILES = ${NOOPTFILES}
 NOOPTFLAGS = ${NOOPTFLAGS}
 # Flags and libraries needed for linking
-LIBS = ${LIBS}
+LIBS = ${LIBS} \$(XLIBS)
 
 EOF